p279094/molgenis-ops-rancher
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Sido Haakma 2018-03-17 22:00:03 +01:00 committed by Gogs
commit 9ea048e7c4
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/molgenis/0/docker-compose.yml
View File

@ -6,20 +6,19 @@ services:
ports: ports:
- 8080 - 8080
links: links:
- app - postgres
- elasticsearch - elasticsearch
volumes: 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"
- "db_driver=org.postgresql.Driver" - "db_driver=org.postgresql.Driver"
- "db_user=molgenis" - "db_user=${DB_USER}"
- "db_password=molgenis" - "db_password=${DB_PASSWORD}"
- "admin.password=admin" - "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:
io.rancher.sidekicks: molgenis-data
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
io.rancher.scheduler.global: true io.rancher.scheduler.global: true
traefik.frontend.rule: Host:${DOMAINS} traefik.frontend.rule: Host:${DOMAINS}
@ -30,8 +29,8 @@ services:
postgres: postgres:
image: postgres:9.6-alpine image: postgres:9.6-alpine
environment: environment:
- POSTGRES_USER=molgenis - POSTGRES_USER=${DB_USER}
- POSTGRES_PASSWORD=molgenis - POSTGRES_PASSWORD=${DB_PASSWORD}
- POSTGRES_DB=${DB_SCHEME} - POSTGRES_DB=${DB_SCHEME}
- PGDATA=/var/lib/postgresql/data/pgdata - PGDATA=/var/lib/postgresql/data/pgdata
volumes: volumes:
@ -39,7 +38,6 @@ services:
ports: ports:
- 5432 - 5432
labels: labels:
io.rancher.sidekicks: postgres-data
io.rancher.scheduler.global: true io.rancher.scheduler.global: true
opencpu: opencpu:
@ -58,15 +56,12 @@ services:
memlock: memlock:
soft: -1 soft: -1
hard: -1 hard: -1
# volumes_from:
# - elasticsearch-data
ports: ports:
- 9200 - 9200
- 9300 - 9300
volumes: volumes:
- elastic-data - elastic-data
labels: labels:
#io.rancher.sidekicks: elasticsearch-data
io.rancher.scheduler.global: true io.rancher.scheduler.global: true
volumes: volumes:

24
templates/molgenis/0/rancher-compose.yml
View File

@ -12,16 +12,34 @@
type: "string" type: "string"
- variable: "TRAEFIK_BACKEND" - variable: "TRAEFIK_BACKEND"
description: "Name of the server when added to loadbalancer" description: "Name of the server when added to loadbalancer"
label: "Backend:" label: "Traefik backend:"
required: true required: true
default: "test.molgenis.org" default: "test.molgenis.org"
type: "string" type: "string"
- variable: "DATABASE_SCHEME" - variable: "DB_SCHEME"
description: "Name of the database scheme" description: "Name of the database scheme"
label: "Scheme:" label: "Database scheme:"
required: true required: true
default: "molgenis" default: "molgenis"
type: "string" type: "string"
- variable: "DB_USER_NAME"
description: "Name of the database username"
label: "Database username:"
required: true
default: "molgenis"
type: "string"
- variable: "DB_PASSWORD"
description: "Password of the database user"
label: "Database password:"
required: true
default: "molgenis"
type: "string"
- variable: "MOLGENIS_ADMIN_PASSWORD"
description: "Passowrd the MOLGENIS admin"
label: "MOLGENIS admin user password:"
required: true
default: "admin"
type: "string"
- variable: "ELASTIC_CLUSTER" - variable: "ELASTIC_CLUSTER"
description: "Name of the elasticsearch cluster" description: "Name of the elasticsearch cluster"
label: "Cluster:" label: "Cluster:"