From 09a634a72f8b35965fdd55c3c01cf977cdf88456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Wed, 23 Jun 2021 15:28:24 +0200 Subject: [PATCH] fix bind MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- containers/zammad/docker-entrypoint.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 4c7c4be..b6e21f5 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -27,8 +27,7 @@ set -e : "${ZAMMAD_RAILSSERVER_PORT:=3000}" : "${ZAMMAD_WEBSOCKET_HOST:=zammad-websocket}" : "${ZAMMAD_WEBSOCKET_PORT:=6042}" -: "${ZAMMAD_WEB_CONCURRENCY:=0}" -: "${ZAMMAD_SESSION_JOBS_CONCURRENT:=}" +: "${ZAMMAD_WEB_CONCURRENCY:=1}" function check_zammad_ready { sleep 15 @@ -140,11 +139,6 @@ fi if [ "$1" = 'zammad-railsserver' ]; then test -f /opt/zammad/tmp/pids/server.pid && rm /opt/zammad/tmp/pids/server.pid - PUMA_OPTS='' - if (( ZAMMAD_WEB_CONCURRENCY > 1 )); then - PUMA_OPTS=" -w $ZAMMAD_WEB_CONCURRENCY" - fi - check_zammad_ready cd "${ZAMMAD_DIR}" @@ -152,7 +146,7 @@ if [ "$1" = 'zammad-railsserver' ]; then echo "starting railsserver... with WEB_CONCURRENCY=${ZAMMAD_WEB_CONCURRENCY}" #shellcheck disable=SC2101 - exec bundle exec puma -b [::]:"${ZAMMAD_RAILSSERVER_PORT}" "${PUMA_OPTS}" -e "${RAILS_ENV}" -C "/opt/zammad/config/puma.rb" + exec bundle exec puma -b tcp://[::]:"${ZAMMAD_RAILSSERVER_PORT}" -w "${ZAMMAD_WEB_CONCURRENCY}" -e "${RAILS_ENV}" fi