Merge remote-tracking branch 'upstream/master' into zammad

templates/zammad/0/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
   elasticsearch:
-    image: zammad/zammad-docker-compose:elasticsearch
+    image: zammad/zammad-docker-compose:zammad-elasticsearch
     labels:
       io.rancher.container.pull_image: always
     restart: always
@@ -11,7 +11,7 @@ services:
   nginx:
     depends_on:
       - zammad
-    image: zammad/zammad-docker-compose:nginx
+    image: zammad/zammad-docker-compose:zammad-nginx
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -24,7 +24,7 @@ services:
       - data-zammad:/home/zammad
 
   postgresql:
-    image: zammad/zammad-docker-compose:postgresql
+    image: zammad/zammad-docker-compose:zammad-postgresql
     labels:
       io.rancher.container.pull_image: always
     restart: always

templates/zammad/0/rancher-compose.yml

@@ -23,7 +23,7 @@ zammad-scheduler:
   start_on_create: true
 zammad-railsserver:
   scale: 1
-  tart_on_create: true
+  start_on_create: true
 zammad-websocket:
   scale: 1
   start_on_create: true

templates/zammad/README.md

@@ -41,7 +41,7 @@ https://docs.zammad.org/en/latest/api-intro.html
 https://zammad.org/participate
 
 
-Thanks! ❤️ ❤️ ❤️
+Thanks! 
 
  Your Zammad Team