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

templates/molgenis/0/docker-compose.yml

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

templates/molgenis/0/rancher-compose.yml

@@ -12,16 +12,34 @@
       type: "string"
     - variable: "TRAEFIK_BACKEND"
       description: "Name of the server when added to loadbalancer"
-      label: "Backend:"
+      label: "Traefik backend:"
       required: true
       default: "test.molgenis.org"
       type: "string"
-    - variable: "DATABASE_SCHEME"
+    - variable: "DB_SCHEME"
       description: "Name of the database scheme"
-      label: "Scheme:"
+      label: "Database scheme:"
       required: true
       default: "molgenis"
       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"
       description: "Name of the elasticsearch cluster"
       label: "Cluster:"