From 7498e9c51c34eee17e9b9b1406b212cbc8f8fa06 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 27 Jun 2024 11:20:49 -0700 Subject: [PATCH] Remove leftover `passenger` references Support for Passenger was removed in 5.0+, and all older versions are now gone/EOL so this code is reasonable to remove. --- 5.0/alpine3.19/docker-entrypoint.sh | 7 +------ 5.0/alpine3.20/docker-entrypoint.sh | 7 +------ 5.0/bookworm/docker-entrypoint.sh | 7 +------ 5.1/alpine3.19/docker-entrypoint.sh | 7 +------ 5.1/alpine3.20/docker-entrypoint.sh | 7 +------ 5.1/bookworm/docker-entrypoint.sh | 7 +------ docker-entrypoint.sh | 7 +------ 7 files changed, 7 insertions(+), 42 deletions(-) diff --git a/5.0/alpine3.19/docker-entrypoint.sh b/5.0/alpine3.19/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.0/alpine3.19/docker-entrypoint.sh +++ b/5.0/alpine3.19/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/5.0/alpine3.20/docker-entrypoint.sh b/5.0/alpine3.20/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.0/alpine3.20/docker-entrypoint.sh +++ b/5.0/alpine3.20/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/5.0/bookworm/docker-entrypoint.sh b/5.0/bookworm/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.0/bookworm/docker-entrypoint.sh +++ b/5.0/bookworm/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/5.1/alpine3.19/docker-entrypoint.sh b/5.1/alpine3.19/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.1/alpine3.19/docker-entrypoint.sh +++ b/5.1/alpine3.19/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/5.1/alpine3.20/docker-entrypoint.sh b/5.1/alpine3.20/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.1/alpine3.20/docker-entrypoint.sh +++ b/5.1/alpine3.20/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/5.1/bookworm/docker-entrypoint.sh b/5.1/bookworm/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/5.1/bookworm/docker-entrypoint.sh +++ b/5.1/bookworm/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ff3f94b..28fe8ce 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -26,7 +26,7 @@ file_env() { isLikelyRedmine= case "$1" in - rails | rake | passenger ) isLikelyRedmine=1 ;; + rails | rake ) isLikelyRedmine=1 ;; esac _fix_permissions() { @@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then # remove PID file to enable restarting the container rm -f tmp/pids/server.pid - - if [ "$1" = 'passenger' ]; then - # Don't fear the reaper. - set -- tini -- "$@" - fi fi exec "$@"