Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed entrypoint script and remover superfluous rancher lables

Browse Source
This commit is contained in:
André Bauer 2017-12-24 16:08:57 +01:00
parent b00217c670
commit b86467b4c4
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containers/zammad/docker-entrypoint.sh
View File

@ -12,7 +12,7 @@ set -e
: "${NGINX_SERVER_NAME:=_}" : "${NGINX_SERVER_NAME:=_}"
function check_zammad_ready { function check_zammad_ready {
sleep 10 sleep 15
until [ -f "${ZAMMAD_READY_FILE}" ]; do until [ -f "${ZAMMAD_READY_FILE}" ]; do
echo "waiting for init container to finish install or update..." echo "waiting for init container to finish install or update..."
sleep 10 sleep 10
@ -22,7 +22,7 @@ function check_zammad_ready {
# zammad init # zammad init
if [ "$1" = 'zammad-init' ]; then if [ "$1" = 'zammad-init' ]; then
# install / update zammad # 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 --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 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 # create install ready file
su -c "echo 'zammad-init' > ${ZAMMAD_READY_FILE}" ${ZAMMAD_USER} su -c "echo 'zammad-init' > ${ZAMMAD_READY_FILE}" ${ZAMMAD_USER}
fi fi
echo "zammad-websocket" >> ${ZAMMAD_READY_FILE}
# zammad nginx # zammad nginx
if [ "$1" = 'zammad-nginx' ]; then if [ "$1" = 'zammad-nginx' ]; then

18
docker-compose.yml
View File

@ -8,8 +8,6 @@ services:
- zammad-railsserver - zammad-railsserver
entrypoint: /usr/local/bin/backup.sh entrypoint: /usr/local/bin/backup.sh
image: ${IMAGE_REPO}:zammad-postgresql${VERSION} image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-postgresql - zammad-postgresql
restart: always restart: always
@ -19,8 +17,6 @@ services:
zammad-elasticsearch: zammad-elasticsearch:
image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION} image: ${IMAGE_REPO}:zammad-elasticsearch${VERSION}
labels:
io.rancher.container.pull_image: always
restart: always restart: always
volumes: volumes:
- elasticsearch-data:/usr/share/elasticsearch/data - elasticsearch-data:/usr/share/elasticsearch/data
@ -30,8 +26,6 @@ services:
depends_on: depends_on:
- zammad-postgresql - zammad-postgresql
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-postgresql - zammad-postgresql
@ -42,8 +36,6 @@ services:
zammad-memcached: zammad-memcached:
command: ["zammad-memcached"] command: ["zammad-memcached"]
image: ${IMAGE_REPO}:zammad-memcached${VERSION} image: ${IMAGE_REPO}:zammad-memcached${VERSION}
labels:
io.rancher.container.pull_image: always
restart: always restart: always
zammad-nginx: zammad-nginx:
@ -51,8 +43,6 @@ services:
depends_on: depends_on:
- zammad-railsserver - zammad-railsserver
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-railsserver - zammad-railsserver
- zammad-websocket - zammad-websocket
@ -62,8 +52,6 @@ services:
zammad-postgresql: zammad-postgresql:
image: ${IMAGE_REPO}:zammad-postgresql${VERSION} image: ${IMAGE_REPO}:zammad-postgresql${VERSION}
labels:
io.rancher.container.pull_image: always
restart: always restart: always
volumes: volumes:
- postgresql-data:/var/lib/postgresql/data - postgresql-data:/var/lib/postgresql/data
@ -74,8 +62,6 @@ services:
- zammad-memcached - zammad-memcached
- zammad-postgresql - zammad-postgresql
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-memcached - zammad-memcached
@ -90,8 +76,6 @@ services:
- zammad-memcached - zammad-memcached
- zammad-railsserver - zammad-railsserver
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-elasticsearch - zammad-elasticsearch
- zammad-memcached - zammad-memcached
@ -106,8 +90,6 @@ services:
- zammad-memcached - zammad-memcached
- zammad-railsserver - zammad-railsserver
image: ${IMAGE_REPO}:zammad${VERSION} image: ${IMAGE_REPO}:zammad${VERSION}
labels:
io.rancher.container.pull_image: always
links: links:
- zammad-postgresql - zammad-postgresql
- zammad-memcached - zammad-memcached