Merge branch 'master' of p281392/molgenis-ops-rancher into master
This commit is contained in:
commit
aa9f4f20ea
@ -3,9 +3,9 @@
|
|||||||
ports:
|
ports:
|
||||||
- 8080
|
- 8080
|
||||||
links:
|
links:
|
||||||
- postgres
|
- app
|
||||||
- elasticsearch
|
- elasticsearch
|
||||||
volumes_from:
|
volumes:
|
||||||
- molgenis-data
|
- molgenis-data
|
||||||
environment:
|
environment:
|
||||||
- "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
|
- "db_uri=jdbc:postgresql://postgres/${DB_SCHEME}?reWriteBatchedInserts=true&autosave=CONSERVATIVE"
|
||||||
@ -31,7 +31,7 @@
|
|||||||
- POSTGRES_PASSWORD=molgenis
|
- POSTGRES_PASSWORD=molgenis
|
||||||
- POSTGRES_DB=${DB_SCHEME}
|
- POSTGRES_DB=${DB_SCHEME}
|
||||||
- PGDATA=/var/lib/postgresql/data/pgdata
|
- PGDATA=/var/lib/postgresql/data/pgdata
|
||||||
volumes_from:
|
volumes:
|
||||||
- postgres-data
|
- postgres-data
|
||||||
ports:
|
ports:
|
||||||
- 5432
|
- 5432
|
||||||
@ -58,29 +58,17 @@
|
|||||||
# volumes_from:
|
# volumes_from:
|
||||||
# - elasticsearch-data
|
# - elasticsearch-data
|
||||||
ports:
|
ports:
|
||||||
- 9200:9200
|
- 9200
|
||||||
- 9300:9300
|
- 9300
|
||||||
|
volumes:
|
||||||
|
- elastic-data
|
||||||
labels:
|
labels:
|
||||||
#io.rancher.sidekicks: elasticsearch-data
|
#io.rancher.sidekicks: elasticsearch-data
|
||||||
io.rancher.scheduler.global: true
|
io.rancher.scheduler.global: true
|
||||||
|
|
||||||
postgres-data:
|
volumes:
|
||||||
image: busybox
|
postgres-data:
|
||||||
labels:
|
molgenis-data:
|
||||||
io.rancher.container.start_once: true
|
elastic-data:
|
||||||
volumes:
|
driver: local
|
||||||
- /var/lib/postgresql/data/pgdata
|
|
||||||
|
|
||||||
molgenis-data:
|
|
||||||
image: busybox
|
|
||||||
labels:
|
|
||||||
io.rancher.container.start_once: true
|
|
||||||
volumes:
|
|
||||||
- /opt/molgenis
|
|
||||||
|
|
||||||
# elasticsearch-data:
|
|
||||||
# image: busybox
|
|
||||||
# labels:
|
|
||||||
# io.rancher.container.start_once: true
|
|
||||||
# volumes:
|
|
||||||
# - /usr/share/elasticsearch/data
|
|
||||||
|
Loading…
Reference in New Issue
Block a user