Merge branch 'master' of p281392/molgenis-ops-rancher into master

This commit is contained in:
S. Haakma authored and Gogs committed 2018-03-17 23:07:19 +01:00
commit d9e5e62be0
7 files changed
+7 -7

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@ services:
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=${DB_USERNAME}" - "db_user=${DB_USERNAME}"
- "db_password=${DB_PASSWORD}" - "db_password=${DB_PASSWORD}"
- "admin.password={MOLGENIS_ADMIN_PASSWORD}" - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
- "elasticsearch.transport.addresses=elasticsearch:9300" - "elasticsearch.transport.addresses=elasticsearch:9300"
labels: labels:
+1 -1
View File
@@ -15,7 +15,7 @@ services:
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=${DB_USERNAME}" - "db_user=${DB_USERNAME}"
- "db_password=${DB_PASSWORD}" - "db_password=${DB_PASSWORD}"
- "admin.password={MOLGENIS_ADMIN_PASSWORD}" - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
- "elasticsearch.transport.addresses=elasticsearch:9300" - "elasticsearch.transport.addresses=elasticsearch:9300"
labels: labels:
+1 -1
View File
@@ -15,7 +15,7 @@ services:
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=${DB_USERNAME}" - "db_user=${DB_USERNAME}"
- "db_password=${DB_PASSWORD}" - "db_password=${DB_PASSWORD}"
- "admin.password={MOLGENIS_ADMIN_PASSWORD}" - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
- "elasticsearch.transport.addresses=elasticsearch:9300" - "elasticsearch.transport.addresses=elasticsearch:9300"
labels: labels:
+1 -1
View File
@@ -15,7 +15,7 @@ services:
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=${DB_USERNAME}" - "db_user=${DB_USERNAME}"
- "db_password=${DB_PASSWORD}" - "db_password=${DB_PASSWORD}"
- "admin.password={MOLGENIS_ADMIN_PASSWORD}" - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
- "elasticsearch.transport.addresses=elasticsearch:9300" - "elasticsearch.transport.addresses=elasticsearch:9300"
labels: labels:
+1 -1
View File
@@ -1,6 +1,6 @@
.catalog: .catalog:
name: molgenis name: molgenis
version: v6.0,0 version: v6.0.0
description: Molgenis description: Molgenis
minimum_rancher_version: v1.6.3 minimum_rancher_version: v1.6.3
questions: questions:
+1 -1
View File
@@ -15,7 +15,7 @@ services:
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=${DB_USERNAME}" - "db_user=${DB_USERNAME}"
- "db_password=${DB_PASSWORD}" - "db_password=${DB_PASSWORD}"
- "admin.password={MOLGENIS_ADMIN_PASSWORD}" - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}" - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
- "elasticsearch.transport.addresses=elasticsearch:9300" - "elasticsearch.transport.addresses=elasticsearch:9300"
labels: labels:
+1 -1
View File
@@ -1,6 +1,6 @@
.catalog: .catalog:
name: molgenis name: molgenis
version: v6.0,0 version: v7.0.0
description: Molgenis description: Molgenis
minimum_rancher_version: v1.6.3 minimum_rancher_version: v1.6.3
questions: questions: