From f6c270f1bde3996a1673038f86b995caa6b8de1a Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 17 Nov 2019 16:48:04 +0100 Subject: [PATCH] Hotfix: wrong set parameter --- 2019.09/apache/entrypoint.sh | 4 +++- 2019.09/fpm-alpine/entrypoint.sh | 4 +++- 2019.09/fpm/entrypoint.sh | 4 +++- 2019.12-dev/apache/entrypoint.sh | 4 +++- 2019.12-dev/fpm-alpine/entrypoint.sh | 4 +++- 2019.12-dev/fpm/entrypoint.sh | 4 +++- docker-entrypoint.sh | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/2019.09/apache/entrypoint.sh b/2019.09/apache/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.09/apache/entrypoint.sh +++ b/2019.09/apache/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/2019.09/fpm-alpine/entrypoint.sh b/2019.09/fpm-alpine/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.09/fpm-alpine/entrypoint.sh +++ b/2019.09/fpm-alpine/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/2019.09/fpm/entrypoint.sh b/2019.09/fpm/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.09/fpm/entrypoint.sh +++ b/2019.09/fpm/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/2019.12-dev/apache/entrypoint.sh b/2019.12-dev/apache/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.12-dev/apache/entrypoint.sh +++ b/2019.12-dev/apache/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/2019.12-dev/fpm-alpine/entrypoint.sh b/2019.12-dev/fpm-alpine/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.12-dev/fpm-alpine/entrypoint.sh +++ b/2019.12-dev/fpm-alpine/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/2019.12-dev/fpm/entrypoint.sh b/2019.12-dev/fpm/entrypoint.sh index f007407..9ea6d64 100755 --- a/2019.12-dev/fpm/entrypoint.sh +++ b/2019.12-dev/fpm/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index f007407..9ea6d64 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,7 +3,7 @@ set -eu # run an command with the www-data user run_as() { - set -- -eu -c "cd /var/www/html; $*" + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then su - www-data -s /bin/sh "$@" else @@ -105,6 +105,8 @@ setup_ssmtp() { fi } +run_as "echo 'test';" + # just check if we execute apache or php-fpm if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0"