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

templates/molgenis/0/docker-compose.yml

@@ -15,9 +15,12 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
+      - "molgenis.home=${MOLGENIS_HOME_DIR}"
       - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
+      - "opencpu.uri.port=8004"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
+      - "JAVA_OPTS=-Xmx${JVM_MEM_POOL} -Xms${JVM_MEM_POOL} -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
     labels:
       io.rancher.container.pull_image: always
       traefik.frontend.rule: Host:${DOMAINS}

templates/molgenis/0/rancher-compose.yml

@@ -34,6 +34,12 @@
       required: true
       default: "molgenis"
       type: "string"
+    - variable: "MOLGENIS_HOME_DIR"
+      description: "Path of the molgenis home directory"
+      label: "Home directory:"
+      required: true
+      default: "/op/molgenis"
+      type: "string"
     - variable: "MOLGENIS_ADMIN_PASSWORD"
       description: "Passowrd the MOLGENIS admin"
       label: "MOLGENIS admin user password:"
@@ -46,6 +52,12 @@
       required: true
       default: "molgenis"
       type: "string"
+    - variable: "JVM_MEM_POOL"
+      description: "Specifies the initial and maximum size, in bytes, of the memory allocation pool."
+      label: "Initial and maximum size:"
+      required: true
+      default: "2g"
+      type: "string"
 
   start_on_create: true
   scale: 1