Merge branch 'master' of p281392/molgenis-ops-rancher into master
This commit is contained in:
commit
d9e5e62be0
@ -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:
|
||||||
|
@ -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:
|
||||||
|
@ -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:
|
||||||
|
@ -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,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:
|
||||||
|
@ -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,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:
|
||||||
|
Loading…
Reference in New Issue
Block a user