From b3f3806379c1c47eec8fdf018f32d49b842af0c9 Mon Sep 17 00:00:00 2001 From: Thiago Alves Cavalcante Date: Wed, 13 May 2020 21:50:10 -0300 Subject: [PATCH] Change params on rsync to a generic variable --- containers/zammad/docker-entrypoint.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index de641d9..b49f2f5 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -19,7 +19,9 @@ set -e : "${ZAMMAD_RAILSSERVER_PORT:=3000}" : "${ZAMMAD_WEBSOCKET_HOST:=zammad-websocket}" : "${ZAMMAD_WEBSOCKET_PORT:=6042}" +: "${ZAMMAD_INSTALL_RSYNC_PARAMS:=--no-perms --no-owner}" : "${NGINX_SERVER_NAME:=_}" +: "${RSYNC_PARAMS:=--no-perms --no-owner}" function check_zammad_ready { sleep 15 @@ -33,8 +35,8 @@ function check_zammad_ready { if [ "$1" = 'zammad-init' ]; then # install / update zammad test -f "${ZAMMAD_READY_FILE}" && rm "${ZAMMAD_READY_FILE}" - rsync -a --no-perms --no-owner --delete --exclude 'public/assets/images/*' --exclude 'storage/fs/*' "${ZAMMAD_TMP_DIR}/" "${ZAMMAD_DIR}" - rsync -a --no-perms --no-owner "${ZAMMAD_TMP_DIR}"/public/assets/images/ "${ZAMMAD_DIR}"/public/assets/images + rsync -a "${RSYNC_PARAMS}" --delete --exclude 'public/assets/images/*' --exclude 'storage/fs/*' "${ZAMMAD_TMP_DIR}/" "${ZAMMAD_DIR}" + rsync -a "${RSYNC_PARAMS}" "${ZAMMAD_TMP_DIR}"/public/assets/images/ "${ZAMMAD_DIR}"/public/assets/images until (echo > /dev/tcp/"${POSTGRESQL_HOST}"/"${POSTGRESQL_PORT}") &> /dev/null; do echo "zammad railsserver waiting for postgresql server to be ready..."