From 67cfb226b7f95d35a1a6db07e263e346483be971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 8 Mar 2017 19:53:07 +0100 Subject: [PATCH 01/13] renamed zammad images --- templates/zammad/1/docker-compose.yml | 81 ++++++++++++++++++++++++++ templates/zammad/1/rancher-compose.yml | 35 +++++++++++ templates/zammad/config.yml | 2 +- 3 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 templates/zammad/1/docker-compose.yml create mode 100644 templates/zammad/1/rancher-compose.yml diff --git a/templates/zammad/1/docker-compose.yml b/templates/zammad/1/docker-compose.yml new file mode 100644 index 0000000..6114f2d --- /dev/null +++ b/templates/zammad/1/docker-compose.yml @@ -0,0 +1,81 @@ +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 diff --git a/templates/zammad/1/rancher-compose.yml b/templates/zammad/1/rancher-compose.yml new file mode 100644 index 0000000..f69b61b --- /dev/null +++ b/templates/zammad/1/rancher-compose.yml @@ -0,0 +1,35 @@ +.catalog: + name: "Zammad" + version: "1.3" + description: "Zammad is a web based open source helpdesk/customer support system" + uuid: zammad-1 + minimum_rancher_version: v1.2.0 + questions: + + zammad: + scale: 1 + start_on_create: true + + zammad-elasticsearch: + scale: 1 + start_on_create: true + + zammad-nginx: + scale: 1 + start_on_create: true + + zammad-postgresql: + scale: 1 + start_on_create: true + + zammad-scheduler: + scale: 1 + start_on_create: true + + zammad-railsserver: + scale: 1 + start_on_create: true + + zammad-websocket: + scale: 1 + start_on_create: true diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index 1f9bdd7..b65d267 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -1,7 +1,7 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system -version: "1.2" +version: "1.3" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad From 18ffa9a698e25287d6329380945da2adfe17ec25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 13 Sep 2017 22:22:37 +0200 Subject: [PATCH 02/13] updated zammad --- templates/zammad/2/docker-compose.yml | 106 +++++++++++++++++++++++++ templates/zammad/2/rancher-compose.yml | 39 +++++++++ templates/zammad/config.yml | 2 +- 3 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 templates/zammad/2/docker-compose.yml create mode 100644 templates/zammad/2/rancher-compose.yml diff --git a/templates/zammad/2/docker-compose.yml b/templates/zammad/2/docker-compose.yml new file mode 100644 index 0000000..99f8d09 --- /dev/null +++ b/templates/zammad/2/docker-compose.yml @@ -0,0 +1,106 @@ +version: '3.3' + +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-backup: + depends_on: + - zammad + image: zammad/zammad-docker-compose:zammad-backup + labels: + io.rancher.container.pull_image: always + links: + - zammad-postgresql + restart: always + volumes: + - data-zammad:/home/zammad + - backup-zammad:/var/tmp/zammad + + zammad-elasticsearch: + image: zammad/zammad-docker-compose:zammad-elasticsearch + labels: + io.rancher.container.pull_image: always + restart: always + volumes: + - data-elasticsearch:/usr/share/elasticsearch/data + + 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: + depends_on: + - zammad + image: zammad/zammad-docker-compose:zammad-railsserver + labels: + io.rancher.container.pull_image: always + links: + - zammad-elasticsearch + - zammad-postgresql + depends_on: + - zammad + restart: always + volumes: + - data-zammad:/home/zammad + + zammad-scheduler: + depends_on: + - zammad + image: zammad/zammad-docker-compose:zammad-scheduler + labels: + io.rancher.container.pull_image: always + links: + - zammad-elasticsearch + - zammad-postgresql + restart: always + volumes: + - data-zammad:/home/zammad + + zammad-websocket: + depends_on: + - zammad + image: zammad/zammad-docker-compose:zammad-websocket + labels: + io.rancher.container.pull_image: always + links: + - zammad-postgresql + - zammad + restart: always + volumes: + - data-zammad:/home/zammad + +volumes: + backup-zammad: + driver: local + data-zammad: + driver: local + data-elasticsearch: + driver: local diff --git a/templates/zammad/2/rancher-compose.yml b/templates/zammad/2/rancher-compose.yml new file mode 100644 index 0000000..dcca4eb --- /dev/null +++ b/templates/zammad/2/rancher-compose.yml @@ -0,0 +1,39 @@ +.catalog: + name: "Zammad" + version: "1.4" + description: "Zammad is a web based open source helpdesk/customer support system" + uuid: zammad-1 + minimum_rancher_version: v1.2.0 + questions: + + zammad: + scale: 1 + start_on_create: true + + zammad-backup: + scale: 1 + start_on_create: true + + zammad-elasticsearch: + scale: 1 + start_on_create: true + + zammad-nginx: + scale: 1 + start_on_create: true + + zammad-postgresql: + scale: 1 + start_on_create: true + + zammad-scheduler: + scale: 1 + start_on_create: true + + zammad-railsserver: + scale: 1 + start_on_create: true + + zammad-websocket: + scale: 1 + start_on_create: true diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index b65d267..064e907 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -1,7 +1,7 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system -version: "1.3" +version: "1.4" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad From 20b96a4ddf4524b114ea0e9d79c0348c643e14b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 13 Sep 2017 22:35:48 +0200 Subject: [PATCH 03/13] fixed compose version --- templates/zammad/2/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zammad/2/docker-compose.yml b/templates/zammad/2/docker-compose.yml index 99f8d09..e9eb953 100644 --- a/templates/zammad/2/docker-compose.yml +++ b/templates/zammad/2/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.3' +version: '2' services: From 18e149e043869287c2caa7aee9febe15368fa4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Fri, 8 Dec 2017 22:34:05 +0100 Subject: [PATCH 04/13] added new version with memcached & init container --- templates/zammad/3/docker-compose.yml | 126 +++++++++++++++++++++++++ templates/zammad/3/rancher-compose.yml | 43 +++++++++ templates/zammad/config.yml | 2 +- 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 templates/zammad/3/docker-compose.yml create mode 100644 templates/zammad/3/rancher-compose.yml diff --git a/templates/zammad/3/docker-compose.yml b/templates/zammad/3/docker-compose.yml new file mode 100644 index 0000000..d83c9a7 --- /dev/null +++ b/templates/zammad/3/docker-compose.yml @@ -0,0 +1,126 @@ +version: '3.3' + +services: + + zammad-backup: + command: ["zammad-backup"] + depends_on: + - zammad-railsserver + entrypoint: /usr/local/bin/backup.sh + image: zammad/zammad-docker-compose:zammad-postgresql + labels: + io.rancher.container.pull_image: always + links: + - zammad-postgresql + restart: always + volumes: + - zammad-backup:/var/tmp/zammad + - zammad-data:/opt/zammad + + zammad-elasticsearch: + image: zammad/zammad-docker-compose:zammad-elasticsearch + labels: + io.rancher.container.pull_image: always + restart: always + volumes: + - elasticsearch-data:/usr/share/elasticsearch/data + + zammad-init: + command: ["zammad-init"] + depends_on: + - zammad-postgresql + image: zammad/zammad-docker-compose:zammad + labels: + io.rancher.container.pull_image: always + 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 + labels: + io.rancher.container.pull_image: always + restart: always + + zammad-nginx: + command: ["zammad-nginx"] + depends_on: + - zammad-railsserver + image: zammad/zammad-docker-compose:zammad + labels: + io.rancher.container.pull_image: always + links: + - zammad-railsserver + - zammad-websocket + restart: always + volumes: + - zammad-data:/opt/zammad + + zammad-postgresql: + image: zammad/zammad-docker-compose:zammad-postgresql + labels: + io.rancher.container.pull_image: always + 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 + labels: + io.rancher.container.pull_image: always + 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 + labels: + io.rancher.container.pull_image: always + 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 + labels: + io.rancher.container.pull_image: always + links: + - zammad-postgresql + - zammad-memcached + restart: always + volumes: + - zammad-data:/opt/zammad + +volumes: + elasticsearch-data: + driver: local + postgresql-data: + driver: local + zammad-backup: + driver: local + zammad-data: + driver: local diff --git a/templates/zammad/3/rancher-compose.yml b/templates/zammad/3/rancher-compose.yml new file mode 100644 index 0000000..cbe1858 --- /dev/null +++ b/templates/zammad/3/rancher-compose.yml @@ -0,0 +1,43 @@ +.catalog: + name: "Zammad" + version: "1.5" + description: "Zammad is a web based open source helpdesk/customer support system" + uuid: zammad-1 + minimum_rancher_version: v1.2.0 + questions: + + zammad-backup: + scale: 1 + start_on_create: true + + zammad-elasticsearch: + 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 + + zammad-postgresql: + scale: 1 + start_on_create: true + + zammad-scheduler: + scale: 1 + start_on_create: true + + zammad-railsserver: + scale: 1 + start_on_create: true + + zammad-websocket: + scale: 1 + start_on_create: true diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index 064e907..76124cb 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -1,7 +1,7 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system -version: "1.4" +version: "1.5" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad From 9a980edadd1ddf1734e96a79ad8ea95284f2e077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 9 Dec 2017 13:14:43 +0100 Subject: [PATCH 05/13] set docker-compose version to 2 --- templates/zammad/3/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zammad/3/docker-compose.yml b/templates/zammad/3/docker-compose.yml index d83c9a7..30cde72 100644 --- a/templates/zammad/3/docker-compose.yml +++ b/templates/zammad/3/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.3' +version: '2' services: From 9944e481b012ba402ae29be29bc96e446002ed25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 11:14:29 +0100 Subject: [PATCH 06/13] - 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 --- ...ker-compose.yml => docker-compose.yml.tpl} | 57 +++++++------ templates/zammad/3/rancher-compose.yml | 84 ++++++++++++------- 2 files changed, 88 insertions(+), 53 deletions(-) rename templates/zammad/3/{docker-compose.yml => docker-compose.yml.tpl} (62%) diff --git a/templates/zammad/3/docker-compose.yml b/templates/zammad/3/docker-compose.yml.tpl similarity index 62% rename from templates/zammad/3/docker-compose.yml rename to templates/zammad/3/docker-compose.yml.tpl index 30cde72..fc889aa 100644 --- a/templates/zammad/3/docker-compose.yml +++ b/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 - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12 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 - labels: - io.rancher.container.pull_image: always + 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 - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-2.2.0-12 links: - zammad-railsserver - zammad-websocket @@ -61,9 +55,7 @@ services: - zammad-data:/opt/zammad zammad-postgresql: - image: zammad/zammad-docker-compose:zammad-postgresql - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-postgresql-2.2.0-12 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 - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-2.2.0-12 links: - zammad-elasticsearch - zammad-memcached @@ -89,9 +79,7 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: zammad/zammad-docker-compose:zammad - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-2.2.0-12 links: - zammad-elasticsearch - zammad-memcached @@ -105,9 +93,7 @@ services: depends_on: - zammad-memcached - zammad-railsserver - image: zammad/zammad-docker-compose:zammad - labels: - io.rancher.container.pull_image: always + image: zammad/zammad-docker-compose:zammad-2.2.0-12 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 diff --git a/templates/zammad/3/rancher-compose.yml b/templates/zammad/3/rancher-compose.yml index cbe1858..7554733 100644 --- a/templates/zammad/3/rancher-compose.yml +++ b/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: - scale: 1 - start_on_create: true + - 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-elasticsearch: - scale: 1 - start_on_create: true + zammad-backup: + scale: 1 + start_on_create: true - zammad-init: - scale: 1 - start_on_create: true + zammad-elasticsearch: + scale: 1 + start_on_create: true - zammad-memcached: - scale: 1 - start_on_create: true + zammad-init: + scale: 1 + start_on_create: true - zammad-nginx: - scale: 1 - start_on_create: true + zammad-memcached: + scale: 1 + start_on_create: true - zammad-postgresql: - scale: 1 - start_on_create: true + zammad-nginx: + scale: 1 + start_on_create: true - zammad-scheduler: - scale: 1 - start_on_create: true + zammad-postgresql: + scale: 1 + start_on_create: true - zammad-railsserver: - scale: 1 - start_on_create: true + zammad-scheduler: + scale: 1 + start_on_create: true - zammad-websocket: - scale: 1 - start_on_create: true + zammad-railsserver: + scale: 1 + 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 From 59c6ec08d0ad2afa95f1e6d34b9d2f5f13e95ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 11:21:48 +0100 Subject: [PATCH 07/13] fixed version in config.yml --- templates/zammad/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index 76124cb..72d0a73 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -1,7 +1,7 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system -version: "1.5" +version: "2.2.0-12" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad From 24730fdd56c88fe601bbaf9593967779bbb3d58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 12:18:21 +0100 Subject: [PATCH 08/13] fixed rancher-compose syntax --- templates/zammad/3/rancher-compose.yml | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/templates/zammad/3/rancher-compose.yml b/templates/zammad/3/rancher-compose.yml index 7554733..9cd075b 100644 --- a/templates/zammad/3/rancher-compose.yml +++ b/templates/zammad/3/rancher-compose.yml @@ -1,11 +1,11 @@ -.catalog: +version: '2' +catalog: name: "Zammad" 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: | @@ -18,54 +18,54 @@ - false - true - zammad-backup: - scale: 1 - start_on_create: true +services: + zammad-backup: + scale: 1 + start_on_create: true - zammad-elasticsearch: - scale: 1 - start_on_create: true + zammad-elasticsearch: + scale: 1 + start_on_create: true - zammad-init: - scale: 1 - start_on_create: true + zammad-init: + scale: 1 + start_on_create: true - zammad-memcached: - scale: 1 - start_on_create: true + zammad-memcached: + scale: 1 + start_on_create: true - zammad-nginx: - scale: 1 - start_on_create: true + zammad-nginx: + scale: 1 + start_on_create: true - zammad-postgresql: - scale: 1 - start_on_create: true + zammad-postgresql: + scale: 1 + start_on_create: true - zammad-scheduler: - scale: 1 - start_on_create: true + zammad-scheduler: + scale: 1 + start_on_create: true - zammad-railsserver: - scale: 1 - start_on_create: true + zammad-railsserver: + scale: 1 + start_on_create: true - zammad-websocket: - scale: 1 - 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-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 + zammad-lb: + scale: 1 + lb_config: + port_rules: + - priority: 1 + protocol: http + source_port: 9797 + target_port: 80 + service: zammad-nginx From 9155ff4fb54ead81d610364c8de9c1c8f2efe6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 12:38:39 +0100 Subject: [PATCH 09/13] renamed version folder 3 to 1 --- templates/zammad/1/docker-compose.yml | 81 ------------- .../zammad/{3 => 1}/docker-compose.yml.tpl | 0 templates/zammad/1/rancher-compose.yml | 42 ++++++- templates/zammad/2/docker-compose.yml | 106 ------------------ templates/zammad/2/rancher-compose.yml | 39 ------- templates/zammad/3/rancher-compose.yml | 71 ------------ 6 files changed, 39 insertions(+), 300 deletions(-) delete mode 100644 templates/zammad/1/docker-compose.yml rename templates/zammad/{3 => 1}/docker-compose.yml.tpl (100%) delete mode 100644 templates/zammad/2/docker-compose.yml delete mode 100644 templates/zammad/2/rancher-compose.yml delete mode 100644 templates/zammad/3/rancher-compose.yml diff --git a/templates/zammad/1/docker-compose.yml b/templates/zammad/1/docker-compose.yml deleted file mode 100644 index 6114f2d..0000000 --- a/templates/zammad/1/docker-compose.yml +++ /dev/null @@ -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 diff --git a/templates/zammad/3/docker-compose.yml.tpl b/templates/zammad/1/docker-compose.yml.tpl similarity index 100% rename from templates/zammad/3/docker-compose.yml.tpl rename to templates/zammad/1/docker-compose.yml.tpl diff --git a/templates/zammad/1/rancher-compose.yml b/templates/zammad/1/rancher-compose.yml index f69b61b..9cd075b 100644 --- a/templates/zammad/1/rancher-compose.yml +++ b/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 diff --git a/templates/zammad/2/docker-compose.yml b/templates/zammad/2/docker-compose.yml deleted file mode 100644 index e9eb953..0000000 --- a/templates/zammad/2/docker-compose.yml +++ /dev/null @@ -1,106 +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-backup: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-backup - labels: - io.rancher.container.pull_image: always - links: - - zammad-postgresql - restart: always - volumes: - - data-zammad:/home/zammad - - backup-zammad:/var/tmp/zammad - - zammad-elasticsearch: - image: zammad/zammad-docker-compose:zammad-elasticsearch - labels: - io.rancher.container.pull_image: always - restart: always - volumes: - - data-elasticsearch:/usr/share/elasticsearch/data - - 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: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-railsserver - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - depends_on: - - zammad - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-scheduler: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-scheduler - labels: - io.rancher.container.pull_image: always - links: - - zammad-elasticsearch - - zammad-postgresql - restart: always - volumes: - - data-zammad:/home/zammad - - zammad-websocket: - depends_on: - - zammad - image: zammad/zammad-docker-compose:zammad-websocket - labels: - io.rancher.container.pull_image: always - links: - - zammad-postgresql - - zammad - restart: always - volumes: - - data-zammad:/home/zammad - -volumes: - backup-zammad: - driver: local - data-zammad: - driver: local - data-elasticsearch: - driver: local diff --git a/templates/zammad/2/rancher-compose.yml b/templates/zammad/2/rancher-compose.yml deleted file mode 100644 index dcca4eb..0000000 --- a/templates/zammad/2/rancher-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -.catalog: - name: "Zammad" - version: "1.4" - description: "Zammad is a web based open source helpdesk/customer support system" - uuid: zammad-1 - minimum_rancher_version: v1.2.0 - questions: - - zammad: - scale: 1 - start_on_create: true - - zammad-backup: - scale: 1 - start_on_create: true - - zammad-elasticsearch: - scale: 1 - start_on_create: true - - zammad-nginx: - scale: 1 - start_on_create: true - - zammad-postgresql: - scale: 1 - start_on_create: true - - zammad-scheduler: - scale: 1 - start_on_create: true - - zammad-railsserver: - scale: 1 - start_on_create: true - - zammad-websocket: - scale: 1 - start_on_create: true diff --git a/templates/zammad/3/rancher-compose.yml b/templates/zammad/3/rancher-compose.yml deleted file mode 100644 index 9cd075b..0000000 --- a/templates/zammad/3/rancher-compose.yml +++ /dev/null @@ -1,71 +0,0 @@ -version: '2' -catalog: - name: "Zammad" - 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 - -services: - zammad-backup: - scale: 1 - start_on_create: true - - zammad-elasticsearch: - 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 - - zammad-postgresql: - scale: 1 - start_on_create: true - - zammad-scheduler: - scale: 1 - start_on_create: true - - zammad-railsserver: - scale: 1 - start_on_create: true - - 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 From a5925e308916bf2d4eb1c9872ae200dadae5f768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 14:19:24 +0100 Subject: [PATCH 10/13] - removed double declaration of nginx services - added nginx health check - fixed labels --- templates/zammad/1/docker-compose.yml.tpl | 12 +++---- templates/zammad/1/rancher-compose.yml | 42 +++++++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/templates/zammad/1/docker-compose.yml.tpl b/templates/zammad/1/docker-compose.yml.tpl index fc889aa..f4d6ba2 100644 --- a/templates/zammad/1/docker-compose.yml.tpl +++ b/templates/zammad/1/docker-compose.yml.tpl @@ -17,8 +17,10 @@ services: zammad-elasticsearch: image: zammad/zammad-docker-compose:zammad-elasticsearch-2.2.0-12 + {{- if eq .Values.UPDATE_SYSCTL "true" }} labels: - io.rancher.sidekicks: {{- if eq .Values.UPDATE_SYSCTL "true" -}}zammad-es-sysctl{{- end}} + io.rancher.sidekicks: zammad-es-sysctl + {{- end}} restart: always volumes: - elasticsearch-data:/usr/share/elasticsearch/data @@ -114,13 +116,9 @@ services: {{- end}} zammad-lb: - image: rancher/lb-service-haproxy:v0.7.15 + image: rancher/lb-service-haproxy:v0.7.9 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' + - ${PUBLISH_PORT}:${PUBLISH_PORT}/tcp volumes: elasticsearch-data: diff --git a/templates/zammad/1/rancher-compose.yml b/templates/zammad/1/rancher-compose.yml index 9cd075b..05459c1 100644 --- a/templates/zammad/1/rancher-compose.yml +++ b/templates/zammad/1/rancher-compose.yml @@ -18,6 +18,14 @@ catalog: - false - true + - variable: "PUBLISH_PORT" + label: "Publish port" + description: | + Set port to publish the service. + required: true + type: "int" + default: 9797 + services: zammad-backup: scale: 1 @@ -31,6 +39,16 @@ services: scale: 1 start_on_create: true + zammad-lb: + scale: 1 + lb_config: + port_rules: + - priority: 1 + protocol: http + source_port: ${PUBLISH_PORT} + target_port: 80 + service: zammad-nginx + zammad-memcached: scale: 1 start_on_create: true @@ -38,6 +56,15 @@ services: zammad-nginx: scale: 1 start_on_create: true + health_check: + healthy_threshold: 2 + response_timeout: 2000 + port: 80 + unhealthy_threshold: 3 + initializing_timeout: 300000 + interval: 2000 + strategy: recreate + request_line: GET "/" "HTTP/1.0" zammad-postgresql: scale: 1 @@ -54,18 +81,3 @@ services: 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 From 726a7ec742ada9d2721e1795ea966e04cbf139f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 14:26:36 +0100 Subject: [PATCH 11/13] order services alphabetically --- templates/zammad/1/docker-compose.yml.tpl | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/templates/zammad/1/docker-compose.yml.tpl b/templates/zammad/1/docker-compose.yml.tpl index f4d6ba2..d32086d 100644 --- a/templates/zammad/1/docker-compose.yml.tpl +++ b/templates/zammad/1/docker-compose.yml.tpl @@ -19,12 +19,24 @@ services: image: zammad/zammad-docker-compose:zammad-elasticsearch-2.2.0-12 {{- if eq .Values.UPDATE_SYSCTL "true" }} labels: - io.rancher.sidekicks: zammad-es-sysctl + io.rancher.sidekicks: zammad-elasticsearch-sysctl {{- end}} restart: always volumes: - elasticsearch-data:/usr/share/elasticsearch/data + {{- if eq .Values.UPDATE_SYSCTL "true" }} + zammad-elasticsearch-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-init: command: ["zammad-init"] depends_on: @@ -39,6 +51,11 @@ services: volumes: - zammad-data:/opt/zammad + zammad-lb: + image: rancher/lb-service-haproxy:v0.7.9 + ports: + - ${PUBLISH_PORT}:${PUBLISH_PORT}/tcp + zammad-memcached: command: ["zammad-memcached"] image: zammad/zammad-docker-compose:zammad-memcached-2.2.0-12 @@ -103,22 +120,7 @@ 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.9 - ports: - - ${PUBLISH_PORT}:${PUBLISH_PORT}/tcp volumes: elasticsearch-data: From 92a2a7a0403d2d8bfba529fcfa10f67098952a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 15:30:55 +0100 Subject: [PATCH 12/13] added defaultVersion to config.yml --- templates/zammad/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index 72d0a73..d015304 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -2,6 +2,7 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system version: "2.2.0-12" +defaultVersion: "2.2.0-12" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad From 0cbeac087536530944deb659b6b3f5477025138b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 19 Dec 2017 16:36:48 +0100 Subject: [PATCH 13/13] - fixed indent - removed some blanklines - removed defaultVersion parameter again --- templates/zammad/1/docker-compose.yml.tpl | 3 --- templates/zammad/1/rancher-compose.yml | 12 ++++++------ templates/zammad/config.yml | 1 - 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/templates/zammad/1/docker-compose.yml.tpl b/templates/zammad/1/docker-compose.yml.tpl index d32086d..b8815ea 100644 --- a/templates/zammad/1/docker-compose.yml.tpl +++ b/templates/zammad/1/docker-compose.yml.tpl @@ -1,7 +1,6 @@ version: '2' services: - zammad-backup: command: ["zammad-backup"] depends_on: @@ -120,8 +119,6 @@ services: volumes: - zammad-data:/opt/zammad - - volumes: elasticsearch-data: driver: local diff --git a/templates/zammad/1/rancher-compose.yml b/templates/zammad/1/rancher-compose.yml index 05459c1..24aa949 100644 --- a/templates/zammad/1/rancher-compose.yml +++ b/templates/zammad/1/rancher-compose.yml @@ -19,12 +19,12 @@ catalog: - true - variable: "PUBLISH_PORT" - label: "Publish port" - description: | - Set port to publish the service. - required: true - type: "int" - default: 9797 + label: "Publish port" + description: | + Set port to publish the service. + required: true + type: "int" + default: 9797 services: zammad-backup: diff --git a/templates/zammad/config.yml b/templates/zammad/config.yml index d015304..72d0a73 100644 --- a/templates/zammad/config.yml +++ b/templates/zammad/config.yml @@ -2,7 +2,6 @@ name: Zammad description: | Zammad is a web based open source helpdesk/customer support system version: "2.2.0-12" -defaultVersion: "2.2.0-12" category: Ticketsystems maintainer: "Zammad Project " projectURL: https://github.com/zammad/zammad