diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 082df1a..43c4543 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -29,6 +29,9 @@ set -e : "${ZAMMAD_WEBSOCKET_PORT:=6042}" : "${ZAMMAD_WEB_CONCURRENCY:=0}" +export MEMCACHE_SERVERS="${MEMCACHE_SERVERS}" +export REDIS_URL="${REDIS_URL}" + function check_zammad_ready { sleep 15 until [ -f "${ZAMMAD_READY_FILE}" ]; do @@ -46,9 +49,6 @@ if [ "$1" = 'zammad-init' ]; then # shellcheck disable=SC2086 rsync -a ${RSYNC_ADDITIONAL_PARAMS} "${ZAMMAD_TMP_DIR}"/public/assets/images/ "${ZAMMAD_DIR}"/public/assets/images - export MEMCACHE_SERVERS="${MEMCACHE_SERVERS}" - export REDIS_URL="${REDIS_URL}" - until (echo > /dev/tcp/"${POSTGRESQL_HOST}"/"${POSTGRESQL_PORT}") &> /dev/null; do echo "zammad railsserver waiting for postgresql server to be ready..." sleep 5 @@ -147,9 +147,6 @@ if [ "$1" = 'zammad-railsserver' ]; then cd "${ZAMMAD_DIR}" - export MEMCACHE_SERVERS="${MEMCACHE_SERVERS}" - export REDIS_URL="${REDIS_URL}" - echo "starting railsserver... with WEB_CONCURRENCY=${ZAMMAD_WEB_CONCURRENCY}" #shellcheck disable=SC2101 @@ -163,9 +160,6 @@ if [ "$1" = 'zammad-scheduler' ]; then cd "${ZAMMAD_DIR}" - export MEMCACHE_SERVERS="${MEMCACHE_SERVERS}" - export REDIS_URL="${REDIS_URL}" - echo "starting scheduler..." exec bundle exec script/scheduler.rb run @@ -178,9 +172,6 @@ if [ "$1" = 'zammad-websocket' ]; then cd "${ZAMMAD_DIR}" - export MEMCACHE_SERVERS="${MEMCACHE_SERVERS}" - export REDIS_URL="${REDIS_URL}" - echo "starting websocket server..." exec bundle exec script/websocket-server.rb -b 0.0.0.0 -p "${ZAMMAD_WEBSOCKET_PORT}" start