From caf4feb06f57236f2c710d9fbf766d690a4af654 Mon Sep 17 00:00:00 2001 From: sido Date: Sat, 17 Mar 2018 22:49:08 +0100 Subject: [PATCH 1/2] fix(rancher-compose): fixed versioning --- templates/molgenis/5/rancher-compose.yml | 2 +- templates/molgenis/6/rancher-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/molgenis/5/rancher-compose.yml b/templates/molgenis/5/rancher-compose.yml index 76cf4f8..0fc307d 100644 --- a/templates/molgenis/5/rancher-compose.yml +++ b/templates/molgenis/5/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: molgenis - version: v6.0,0 + version: v6.0.0 description: Molgenis minimum_rancher_version: v1.6.3 questions: diff --git a/templates/molgenis/6/rancher-compose.yml b/templates/molgenis/6/rancher-compose.yml index 76cf4f8..e61f931 100644 --- a/templates/molgenis/6/rancher-compose.yml +++ b/templates/molgenis/6/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: molgenis - version: v6.0,0 + version: v7.0.0 description: Molgenis minimum_rancher_version: v1.6.3 questions: From 9ac3fe14397452c87d9838898d0c27a6c03b21f5 Mon Sep 17 00:00:00 2001 From: sido Date: Sat, 17 Mar 2018 23:06:40 +0100 Subject: [PATCH 2/2] fix(docker-compose): fix molgenis admin password --- templates/molgenis/0/docker-compose.yml | 2 +- templates/molgenis/1/docker-compose.yml | 2 +- templates/molgenis/4/docker-compose.yml | 2 +- templates/molgenis/5/docker-compose.yml | 2 +- templates/molgenis/6/docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml index b9fa82e..e82aefe 100644 --- a/templates/molgenis/0/docker-compose.yml +++ b/templates/molgenis/0/docker-compose.yml @@ -15,7 +15,7 @@ services: - "db_driver=org.postgresql.Driver" - "db_user=${DB_USERNAME}" - "db_password=${DB_PASSWORD}" - - "admin.password={MOLGENIS_ADMIN_PASSWORD}" + - "admin.password=${MOLGENIS_ADMIN_PASSWORD}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.transport.addresses=elasticsearch:9300" labels: diff --git a/templates/molgenis/1/docker-compose.yml b/templates/molgenis/1/docker-compose.yml index f583316..854776e 100644 --- a/templates/molgenis/1/docker-compose.yml +++ b/templates/molgenis/1/docker-compose.yml @@ -15,7 +15,7 @@ services: - "db_driver=org.postgresql.Driver" - "db_user=${DB_USERNAME}" - "db_password=${DB_PASSWORD}" - - "admin.password={MOLGENIS_ADMIN_PASSWORD}" + - "admin.password=${MOLGENIS_ADMIN_PASSWORD}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.transport.addresses=elasticsearch:9300" labels: diff --git a/templates/molgenis/4/docker-compose.yml b/templates/molgenis/4/docker-compose.yml index 2946d3c..521d1e6 100644 --- a/templates/molgenis/4/docker-compose.yml +++ b/templates/molgenis/4/docker-compose.yml @@ -15,7 +15,7 @@ services: - "db_driver=org.postgresql.Driver" - "db_user=${DB_USERNAME}" - "db_password=${DB_PASSWORD}" - - "admin.password={MOLGENIS_ADMIN_PASSWORD}" + - "admin.password=${MOLGENIS_ADMIN_PASSWORD}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.transport.addresses=elasticsearch:9300" labels: diff --git a/templates/molgenis/5/docker-compose.yml b/templates/molgenis/5/docker-compose.yml index 6435aca..3b48780 100644 --- a/templates/molgenis/5/docker-compose.yml +++ b/templates/molgenis/5/docker-compose.yml @@ -15,7 +15,7 @@ services: - "db_driver=org.postgresql.Driver" - "db_user=${DB_USERNAME}" - "db_password=${DB_PASSWORD}" - - "admin.password={MOLGENIS_ADMIN_PASSWORD}" + - "admin.password=${MOLGENIS_ADMIN_PASSWORD}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.transport.addresses=elasticsearch:9300" labels: diff --git a/templates/molgenis/6/docker-compose.yml b/templates/molgenis/6/docker-compose.yml index 39a7267..e85d060 100644 --- a/templates/molgenis/6/docker-compose.yml +++ b/templates/molgenis/6/docker-compose.yml @@ -15,7 +15,7 @@ services: - "db_driver=org.postgresql.Driver" - "db_user=${DB_USERNAME}" - "db_password=${DB_PASSWORD}" - - "admin.password={MOLGENIS_ADMIN_PASSWORD}" + - "admin.password=${MOLGENIS_ADMIN_PASSWORD}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.transport.addresses=elasticsearch:9300" labels: