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

templates/molgenis/0/docker-compose.yml

@@ -8,12 +8,12 @@
     volumes_from:
       - molgenis-data
     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_user=molgenis"
       - "db_password=molgenis"
       - "admin.password=admin"
-      - "elasticsearch.cluster.name=molgenis"
+      - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
       io.rancher.sidekicks: molgenis-data
@@ -29,7 +29,7 @@
     environment:
       - POSTGRES_USER=molgenis
       - POSTGRES_PASSWORD=molgenis
-      - POSTGRES_DB=molgenis
+      - POSTGRES_DB=${DB_SCHEME}
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes_from:
       - postgres-data
@@ -47,7 +47,7 @@
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:5.5.1
     environment:
-      - "cluster.name=molgenis"
+      - "cluster.name=${ELASTIC_CLUSTER}"
       - "bootstrap.memory_lock=true"
       - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
       - "xpack.security.enabled=false"

templates/molgenis/0/rancher-compose.yml

@@ -16,6 +16,18 @@
       required: true
       default: "test.molgenis.org"
       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
   scale: 1