chore(docker-compose): add schema name and clustername to variable list
This commit is contained in:
parent
67323a5917
commit
6177319164
@ -8,12 +8,12 @@
|
|||||||
volumes_from:
|
volumes_from:
|
||||||
- molgenis-data
|
- molgenis-data
|
||||||
environment:
|
environment:
|
||||||
- "db_uri=jdbc:postgresql://postgres/molgenis?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
|
- "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
|
||||||
- "db_driver=org.postgresql.Driver"
|
- "db_driver=org.postgresql.Driver"
|
||||||
- "db_user=molgenis"
|
- "db_user=molgenis"
|
||||||
- "db_password=molgenis"
|
- "db_password=molgenis"
|
||||||
- "admin.password=admin"
|
- "admin.password=admin"
|
||||||
- "elasticsearch.cluster.name=molgenis"
|
- "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
|
||||||
- "elasticsearch.transport.addresses=elasticsearch:9300"
|
- "elasticsearch.transport.addresses=elasticsearch:9300"
|
||||||
labels:
|
labels:
|
||||||
io.rancher.sidekicks: molgenis-data
|
io.rancher.sidekicks: molgenis-data
|
||||||
@ -29,7 +29,7 @@
|
|||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=molgenis
|
- POSTGRES_USER=molgenis
|
||||||
- POSTGRES_PASSWORD=molgenis
|
- POSTGRES_PASSWORD=molgenis
|
||||||
- POSTGRES_DB=molgenis
|
- POSTGRES_DB=${DB_SCHEME}
|
||||||
- PGDATA=/var/lib/postgresql/data/pgdata
|
- PGDATA=/var/lib/postgresql/data/pgdata
|
||||||
volumes_from:
|
volumes_from:
|
||||||
- postgres-data
|
- postgres-data
|
||||||
@ -47,7 +47,7 @@
|
|||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
|
image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
|
||||||
environment:
|
environment:
|
||||||
- "cluster.name=molgenis"
|
- "cluster.name=${ELASTIC_CLUSTER}"
|
||||||
- "bootstrap.memory_lock=true"
|
- "bootstrap.memory_lock=true"
|
||||||
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
|
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
|
||||||
- "xpack.security.enabled=false"
|
- "xpack.security.enabled=false"
|
||||||
|
@ -16,6 +16,18 @@
|
|||||||
required: true
|
required: true
|
||||||
default: "test.molgenis.org"
|
default: "test.molgenis.org"
|
||||||
type: "string"
|
type: "string"
|
||||||
|
- variable: "DATABASE_SCHEME"
|
||||||
|
description: "Name of the database scheme"
|
||||||
|
label: "Scheme:"
|
||||||
|
required: true
|
||||||
|
default: "molgenis"
|
||||||
|
type: "string"
|
||||||
|
- variable: "ELASTIC_CLUSTER"
|
||||||
|
description: "Name of the elasticsearch cluster"
|
||||||
|
label: "Cluster:"
|
||||||
|
required: true
|
||||||
|
default: "molgenis"
|
||||||
|
type: "string"
|
||||||
|
|
||||||
start_on_create: true
|
start_on_create: true
|
||||||
scale: 1
|
scale: 1
|
||||||
|
Loading…
Reference in New Issue
Block a user