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

Maintenance: Provide performance tuning options for docker-compose (#217)

Browse Source 
* Maintenance: Provide performance tuning options for docker-compose

* Maintenance: Ensure PUMA_OPTS being available anytime

* Maintenance: Move PUMA_OPTS position

* Maintenance: Adjust puma startup command to allow cluster workers

* Maintenance: Solve SC2086

* Maintenance: Ensure puma knows it's config

* Fix Typo to load config file

* Maintenance: Tell puma what its correct config is...

* fix bind

Signed-off-by: André Bauer <monotek23@gmail.com>

* change concurency to 0 by default

Signed-off-by: André Bauer <monotek23@gmail.com>

Co-authored-by: André Bauer <monotek23@gmail.com>
This commit is contained in:
Marcel Herrguth 2021-06-23 18:04:19 +02:00 committed by GitHub
parent fb9a9b2085
commit 3866262aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ set -e
: "${ZAMMAD_RAILSSERVER_PORT:=3000}" : "${ZAMMAD_RAILSSERVER_PORT:=3000}"
: "${ZAMMAD_WEBSOCKET_HOST:=zammad-websocket}" : "${ZAMMAD_WEBSOCKET_HOST:=zammad-websocket}"
: "${ZAMMAD_WEBSOCKET_PORT:=6042}" : "${ZAMMAD_WEBSOCKET_PORT:=6042}"
: "${ZAMMAD_WEB_CONCURRENCY:=0}"
function check_zammad_ready { function check_zammad_ready {
sleep 15 sleep 15
@ -142,10 +143,10 @@ if [ "$1" = 'zammad-railsserver' ]; then
cd "${ZAMMAD_DIR}" cd "${ZAMMAD_DIR}"
echo "starting railsserver..." echo "starting railsserver... with WEB_CONCURRENCY=${ZAMMAD_WEB_CONCURRENCY}"
#shellcheck disable=SC2101 #shellcheck disable=SC2101
exec bundle exec rails server puma -b [::] -p "${ZAMMAD_RAILSSERVER_PORT}" -e "${RAILS_ENV}" exec bundle exec puma -b tcp://[::]:"${ZAMMAD_RAILSSERVER_PORT}" -w "${ZAMMAD_WEB_CONCURRENCY}" -e "${RAILS_ENV}"
fi fi