renamed version folder 3 to 1

templates/zammad/1/docker-compose.yml

@@ -1,81 +0,0 @@
-version: '2'
-
-services:
-
-  zammad:
-    depends_on:
-      - zammad-elasticsearch
-      - zammad-postgresql
-    image: zammad/zammad-docker-compose:zammad
-    labels:
-      io.rancher.container.pull_image: always
-      io.rancher.container.start_once: 'true'
-    restart: on-failure
-    volumes:
-      - data-zammad:/home/zammad
-
-  zammad-elasticsearch:
-    image: zammad/zammad-docker-compose:zammad-elasticsearch
-    labels:
-      io.rancher.container.pull_image: always
-    restart: always
-
-  zammad-nginx:
-    depends_on:
-      - zammad
-    image: zammad/zammad-docker-compose:zammad-nginx
-    labels:
-      io.rancher.container.pull_image: always
-    links:
-      - zammad-railsserver
-      - zammad-websocket
-    ports:
-      - "80:80"
-    restart: always
-    volumes:
-      - data-zammad:/home/zammad
-
-  zammad-postgresql:
-    image: zammad/zammad-docker-compose:zammad-postgresql
-    labels:
-      io.rancher.container.pull_image: always
-    restart: always
-
-  zammad-railsserver:
-    image: zammad/zammad-docker-compose:zammad-railsserver
-    labels:
-      io.rancher.container.pull_image: always
-    links:
-      - zammad-elasticsearch
-      - zammad-postgresql
-      - zammad
-    depends_on:
-      - zammad
-    restart: always
-
-  zammad-scheduler:
-    image: zammad/zammad-docker-compose:zammad-scheduler
-    labels:
-      io.rancher.container.pull_image: always
-    links:
-      - zammad-elasticsearch
-      - zammad-postgresql
-      - zammad
-    depends_on:
-      - zammad-railsserver
-    restart: always
-
-  zammad-websocket:
-    image: zammad/zammad-docker-compose:zammad-websocket
-    labels:
-      io.rancher.container.pull_image: always
-    links:
-      - zammad-postgresql
-      - zammad
-    depends_on:
-      - zammad-railsserver
-    restart: always
-
-volumes:
-  data-zammad:
-    driver: local

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

@@ -0,0 +1,133 @@
+version: '2'
+
+services:
+
+  zammad-backup:
+    command: ["zammad-backup"]
+    depends_on:
+      - zammad-railsserver
+    entrypoint: /usr/local/bin/backup.sh
+    image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12
+    links:
+      - zammad-postgresql
+    restart: always
+    volumes:
+      - zammad-backup:/var/tmp/zammad
+      - zammad-data:/opt/zammad
+
+  zammad-elasticsearch:
+    image: zammad/zammad-docker-compose:zammad-elasticsearch-2.2.0-12
+    labels:
+      io.rancher.sidekicks: {{- if eq .Values.UPDATE_SYSCTL "true" -}}zammad-es-sysctl{{- end}}
+    restart: always
+    volumes:
+      - elasticsearch-data:/usr/share/elasticsearch/data
+
+  zammad-init:
+    command: ["zammad-init"]
+    depends_on:
+      - zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
+    labels:
+      io.rancher.container.start_once: true
+    links:
+      - zammad-elasticsearch
+      - zammad-postgresql
+    restart: on-failure
+    volumes:
+      - zammad-data:/opt/zammad
+
+  zammad-memcached:
+    command: ["zammad-memcached"]
+    image: zammad/zammad-docker-compose:zammad-memcached-2.2.0-12
+    restart: always
+
+  zammad-nginx:
+    command: ["zammad-nginx"]
+    depends_on:
+      - zammad-railsserver
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
+    links:
+      - zammad-railsserver
+      - zammad-websocket
+    restart: always
+    volumes:
+      - zammad-data:/opt/zammad
+
+  zammad-postgresql:
+    image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12
+    restart: always
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+
+  zammad-railsserver:
+    command: ["zammad-railsserver"]
+    depends_on:
+      - zammad-memcached
+      - zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
+    links:
+      - zammad-elasticsearch
+      - zammad-memcached
+      - zammad-postgresql
+    restart: always
+    volumes:
+      - zammad-data:/opt/zammad
+
+  zammad-scheduler:
+    command: ["zammad-scheduler"]
+    depends_on:
+      - zammad-memcached
+      - zammad-railsserver
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
+    links:
+      - zammad-elasticsearch
+      - zammad-memcached
+      - zammad-postgresql
+    restart: always
+    volumes:
+      - zammad-data:/opt/zammad
+
+  zammad-websocket:
+    command: ["zammad-websocket"]
+    depends_on:
+      - zammad-memcached
+      - zammad-railsserver
+    image: zammad/zammad-docker-compose:zammad-2.2.0-12
+    links:
+      - zammad-postgresql
+      - zammad-memcached
+    restart: always
+    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
+  postgresql-data:
+    driver: local
+  zammad-backup:
+    driver: local
+  zammad-data:
+    driver: local

templates/zammad/1/rancher-compose.yml

@@ -1,12 +1,25 @@
-.catalog:
+version: '2'
+catalog:
   name: "Zammad"
-  version: "1.3"
+  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:
+    - variable: "UPDATE_SYSCTL"
+      label: "Update host sysctl:"
+      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:
+services:
+  zammad-backup:
     scale: 1
     start_on_create: true
 
@@ -14,6 +27,14 @@
     scale: 1
     start_on_create: true
 
+  zammad-init:
+    scale: 1
+    start_on_create: true
+
+  zammad-memcached:
+    scale: 1
+    start_on_create: true
+
   zammad-nginx:
     scale: 1
     start_on_create: true
@@ -33,3 +54,18 @@
   zammad-websocket:
     scale: 1
     start_on_create: true
+
+  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