From 49f38cf8dabd02ede0ebdcf32a71390b3eeb3008 Mon Sep 17 00:00:00 2001 From: sido Date: Fri, 9 Mar 2018 08:14:43 +0100 Subject: [PATCH] fix(added options): added domain options to catalogue --- templates/molgenis/0/rancher-compose.yml | 19 +++++++++++++- templates/molgenis/1/rancher-compose.yml | 19 +++++++++++++- templates/molgenis/2/rancher-compose.yml | 19 +++++++++++++- templates/molgenis/3/docker-compose.yml | 4 +-- templates/molgenis/3/rancher-compose.yml | 32 +++++++++++++----------- 5 files changed, 74 insertions(+), 19 deletions(-) diff --git a/templates/molgenis/0/rancher-compose.yml b/templates/molgenis/0/rancher-compose.yml index b1c3e50..8d89458 100644 --- a/templates/molgenis/0/rancher-compose.yml +++ b/templates/molgenis/0/rancher-compose.yml @@ -2,4 +2,21 @@ name: molgenis version: v2.0.0 description: Molgenis - minimum_rancher_version: v1.6.3 \ No newline at end of file + minimum_rancher_version: v1.6.3 + questions: + - variable: "DOMAINS" + description: "Domain you want to use (comma seperated)" + label: "Domains:" + required: true + default: "test.molgenis.org,test.dcktest.gcc.rug.nl" + type: "string" + + start_on_create: true + scale: 1 + health_check: + port: 8080 + interval: 5000 + unhealthy_threshold: 3 + request_line: 'GET / HTTP/1.0' + healthy_threshold: 2 + response_timeout: 5000 \ No newline at end of file diff --git a/templates/molgenis/1/rancher-compose.yml b/templates/molgenis/1/rancher-compose.yml index fc27a32..25911b7 100644 --- a/templates/molgenis/1/rancher-compose.yml +++ b/templates/molgenis/1/rancher-compose.yml @@ -2,4 +2,21 @@ name: molgenis version: v4.1.0 description: Molgenis - minimum_rancher_version: v1.6.3 \ No newline at end of file + minimum_rancher_version: v1.6.3 + questions: + - variable: "DOMAINS" + description: "Domain you want to use (comma seperated)" + label: "Domains:" + required: true + default: "test.molgenis.org,test.dcktest.gcc.rug.nl" + type: "string" + + start_on_create: true + scale: 1 + health_check: + port: 8080 + interval: 5000 + unhealthy_threshold: 3 + request_line: 'GET / HTTP/1.0' + healthy_threshold: 2 + response_timeout: 5000 \ No newline at end of file diff --git a/templates/molgenis/2/rancher-compose.yml b/templates/molgenis/2/rancher-compose.yml index 9f4fe01..14b43e4 100644 --- a/templates/molgenis/2/rancher-compose.yml +++ b/templates/molgenis/2/rancher-compose.yml @@ -2,4 +2,21 @@ name: molgenis version: v5.2.0 description: Molgenis - minimum_rancher_version: v1.6.3 \ No newline at end of file + minimum_rancher_version: v1.6.3 + questions: + - variable: "DOMAINS" + description: "Domain you want to use (comma seperated)" + label: "Domains:" + required: true + default: "test.molgenis.org,test.dcktest.gcc.rug.nl" + type: "string" + + start_on_create: true + scale: 1 + health_check: + port: 8080 + interval: 5000 + unhealthy_threshold: 3 + request_line: 'GET / HTTP/1.0' + healthy_threshold: 2 + response_timeout: 5000 \ No newline at end of file diff --git a/templates/molgenis/3/docker-compose.yml b/templates/molgenis/3/docker-compose.yml index 13cce5f..37f670e 100644 --- a/templates/molgenis/3/docker-compose.yml +++ b/templates/molgenis/3/docker-compose.yml @@ -1,7 +1,7 @@ molgenis: image: webhost12.service.rug.nl/molgenis/molgenis:6.0.0 ports: - - 8081:8080 + - 8080 links: - postgres - elasticsearch @@ -9,8 +9,8 @@ - molgenis-data labels: io.rancher.sidekicks: molgenis-data - io.rancher.scheduler.global: true io.rancher.container.pull_image: always + io.rancher.scheduler.global: true traefik.frontend.rule: Host:${DOMAINS} traefik.enable: true traefik.port: 8080 diff --git a/templates/molgenis/3/rancher-compose.yml b/templates/molgenis/3/rancher-compose.yml index 7b53ec2..00d9b24 100644 --- a/templates/molgenis/3/rancher-compose.yml +++ b/templates/molgenis/3/rancher-compose.yml @@ -1,18 +1,22 @@ .catalog: name: molgenis - version: v5.2.0 + version: v6.0.0 description: Molgenis minimum_rancher_version: v1.6.3 -#loadbalancer: -# scale: 1 -# lb_config: -# port_rules: -# - source_port: 80 -# target_port: 8081 -# service: molgenis -# health_check: -# port: 42 -# interval: 2000 -# unhealthy_threshold: 3 -# healthy_threshold: 2 -# response_timeout: 2000 \ No newline at end of file + questions: + - variable: "DOMAINS" + description: "Domain you want to use (comma seperated)" + label: "Domains:" + required: true + default: "test.molgenis.org,test.dcktest.gcc.rug.nl" + type: "string" + + start_on_create: true + scale: 1 + health_check: + port: 8080 + interval: 5000 + unhealthy_threshold: 3 + request_line: 'GET / HTTP/1.0' + healthy_threshold: 2 + response_timeout: 5000