From b86467b4c4cefe00c3a6e2a2f3712c7250c61f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Sun, 24 Dec 2017 16:08:57 +0100
Subject: [PATCH] fixed entrypoint script and remover superfluous rancher
 lables

---
 containers/zammad/docker-entrypoint.sh |  5 ++---
 docker-compose.yml                     | 18 ------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index 35c7d5f..5fbadda 100644
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -12,7 +12,7 @@ set -e
 : "${NGINX_SERVER_NAME:=_}"
 
 function check_zammad_ready {
-  sleep 10
+  sleep 15
   until [ -f "${ZAMMAD_READY_FILE}" ]; do
     echo "waiting for init container to finish install or update..."
     sleep 10
@@ -22,7 +22,7 @@ function check_zammad_ready {
 # zammad init
 if [ "$1" = 'zammad-init' ]; then
   # install / update zammad
-  rm -rf ${ZAMMAD_DIR:=?}/tmp
+  rm ${ZAMMAD_READY_FILE}
   rsync -a --delete --exclude 'storage/fs/*' --exclude 'public/assets/images/*' ${ZAMMAD_TMP_DIR}/ ${ZAMMAD_DIR}
   rsync -a ${ZAMMAD_TMP_DIR}/public/assets/images/ ${ZAMMAD_DIR}/public/assets/images
 
@@ -73,7 +73,6 @@ if [ "$1" = 'zammad-init' ]; then
   # create install ready file
   su -c "echo 'zammad-init' > ${ZAMMAD_READY_FILE}" ${ZAMMAD_USER}
 fi
-  echo "zammad-websocket" >> ${ZAMMAD_READY_FILE}
 
 # zammad nginx
 if [ "$1" = 'zammad-nginx' ]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index 9eec6aa..5460332 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,6 @@ services:
       - zammad-railsserver
     entrypoint: /usr/local/bin/backup.sh
     image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-postgresql
     restart: always
@@ -19,8 +17,6 @@ services:
 
   zammad-elasticsearch:
     image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     restart: always
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
@@ -30,8 +26,6 @@ services:
     depends_on:
       - zammad-postgresql
     image: ${IMAGE_REPO}:zammad${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-postgresql
@@ -42,8 +36,6 @@ services:
   zammad-memcached:
     command: ["zammad-memcached"]
     image: ${IMAGE_REPO}:zammad-memcached${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     restart: always
 
   zammad-nginx:
@@ -51,8 +43,6 @@ services:
     depends_on:
       - zammad-railsserver
     image: ${IMAGE_REPO}:zammad${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-railsserver
       - zammad-websocket
@@ -62,8 +52,6 @@ services:
 
   zammad-postgresql:
     image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     restart: always
     volumes:
       - postgresql-data:/var/lib/postgresql/data
@@ -74,8 +62,6 @@ services:
       - zammad-memcached
       - zammad-postgresql
     image: ${IMAGE_REPO}:zammad${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-memcached
@@ -90,8 +76,6 @@ services:
       - zammad-memcached
       - zammad-railsserver
     image: ${IMAGE_REPO}:zammad${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-elasticsearch
       - zammad-memcached
@@ -106,8 +90,6 @@ services:
       - zammad-memcached
       - zammad-railsserver
     image: ${IMAGE_REPO}:zammad${VERSION}
-    labels:
-      io.rancher.container.pull_image: always
     links:
       - zammad-postgresql
       - zammad-memcached