- added sysctl sidekick for es

- added rancher service and loadbalancer
- added docker image version tag & correct rancher version
- removed "io.rancher.container.pull_image: always" labels

templates/zammad/3/docker-compose.yml.tpl

@@ -7,9 +7,7 @@ services:
     depends_on:
       - zammad-railsserver
     entrypoint: /usr/local/bin/backup.sh
-    image: zammad/zammad-docker-compose:zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-postgresql
     restart: always
@@ -18,9 +16,9 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-elasticsearch:
-    image: zammad/zammad-docker-compose:zammad-elasticsearch
+    image: zammad/zammad-docker-compose:zammad-elasticsearch-2.2.0-12
     labels:
-      io.rancher.container.pull_image: always
+      io.rancher.sidekicks: {{- if eq .Values.UPDATE_SYSCTL "true" -}}zammad-es-sysctl{{- end}}
     restart: always
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
@@ -29,9 +27,9 @@ services:
     command: ["zammad-init"]
     depends_on:
       - zammad-postgresql
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
     labels:
-      io.rancher.container.pull_image: always
+      io.rancher.container.start_once: true
     links:
       - zammad-elasticsearch
       - zammad-postgresql
@@ -41,18 +39,14 @@ services:
 
   zammad-memcached:
     command: ["zammad-memcached"]
-    image: zammad/zammad-docker-compose:zammad-memcached
+    image: zammad/zammad-docker-compose:zammad-memcached-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     restart: always
 
   zammad-nginx:
     command: ["zammad-nginx"]
     depends_on:
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-railsserver
       - zammad-websocket
@@ -61,9 +55,7 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-postgresql:
-    image: zammad/zammad-docker-compose:zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     restart: always
     volumes:
       - postgresql-data:/var/lib/postgresql/data
@@ -73,9 +65,7 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-postgresql
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-memcached
@@ -89,9 +79,7 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-memcached
@@ -105,9 +93,7 @@ services:
     depends_on:
       - zammad-memcached
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-postgresql
       - zammad-memcached
@@ -115,6 +101,27 @@ services:
     volumes:
       - zammad-data:/opt/zammad
 
+  {{- if eq .Values.UPDATE_SYSCTL "true" }}
+  zammad-es-sysctl:
+    labels:
+        io.rancher.container.start_once: true
+    network_mode: none
+    image: rawmind/alpine-sysctl:0.1
+    privileged: true
+    environment:
+        - "SYSCTL_KEY=vm.max_map_count"
+        - "SYSCTL_VALUE=262144"
+  {{- end}}
+
+  zammad-lb:
+    image: rancher/lb-service-haproxy:v0.7.15
+    ports:
+      - 9797:9797/tcp
+    labels:
+      io.rancher.container.agent.role: environmentAdmin,agent
+      io.rancher.container.agent_service.drain_provider: 'true'
+      io.rancher.container.create_agent: 'true'
+
 volumes:
   elasticsearch-data:
     driver: local

templates/zammad/3/rancher-compose.yml

@@ -1,43 +1,71 @@
 .catalog:
   name: "Zammad"
-  version: "1.5"
+  version: "2.2.0-12"
   description: "Zammad is a web based open source helpdesk/customer support system"
   uuid: zammad-1
   minimum_rancher_version: v1.2.0
   questions:
 
-  zammad-backup:
+    - variable: "UPDATE_SYSCTL"
-    scale: 1
+      label: "Update host sysctl:"
-    start_on_create: true
+      description: |
+        Set true to avoid vm.max_map_count errors.
+        WARN: If set true, host param vm.max_map_count will be update to 262144.
+      default: false
+      required: true
+      type: enum
+      options:
+        - false
+        - true
 
-  zammad-elasticsearch:
+    zammad-backup:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-init:
+    zammad-elasticsearch:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-memcached:
+    zammad-init:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-nginx:
+    zammad-memcached:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-postgresql:
+    zammad-nginx:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-scheduler:
+    zammad-postgresql:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-railsserver:
+    zammad-scheduler:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
 
-  zammad-websocket:
+    zammad-railsserver:
-    scale: 1
+      scale: 1
-    start_on_create: true
+      start_on_create: true
+
+    zammad-websocket:
+      scale: 1
+      start_on_create: true
+
+  services:
+    zammad-nginx:
+      scale: 1
+      start_on_create: true
+      drain_timeout_ms: 10000
+
+    zammad-lb:
+      scale: 1
+      lb_config:
+        port_rules:
+        - priority: 1
+          protocol: http
+          source_port: 9797
+          target_port: 80
+          service: zammad-nginx