From 39ef8ac58708f49f47ca9c800f1262cfcdd2e754 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 15 Feb 2022 22:50:54 +0100 Subject: [PATCH] Fix missing php executable --- 2021.09/apache/entrypoint.sh | 3 ++- 2021.09/fpm-alpine/entrypoint.sh | 3 ++- 2021.09/fpm/entrypoint.sh | 3 ++- 2022.02/apache/entrypoint.sh | 3 ++- 2022.02/fpm-alpine/entrypoint.sh | 3 ++- 2022.02/fpm/entrypoint.sh | 3 ++- 2022.05-dev/apache/entrypoint.sh | 3 ++- 2022.05-dev/fpm-alpine/entrypoint.sh | 3 ++- 2022.05-dev/fpm/entrypoint.sh | 3 ++- docker-entrypoint.sh | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/2021.09/apache/entrypoint.sh b/2021.09/apache/entrypoint.sh index ce76805..cfe9850 100755 --- a/2021.09/apache/entrypoint.sh +++ b/2021.09/apache/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2021.09/fpm-alpine/entrypoint.sh b/2021.09/fpm-alpine/entrypoint.sh index ce76805..cfe9850 100755 --- a/2021.09/fpm-alpine/entrypoint.sh +++ b/2021.09/fpm-alpine/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2021.09/fpm/entrypoint.sh b/2021.09/fpm/entrypoint.sh index ce76805..cfe9850 100755 --- a/2021.09/fpm/entrypoint.sh +++ b/2021.09/fpm/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.02/apache/entrypoint.sh b/2022.02/apache/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.02/apache/entrypoint.sh +++ b/2022.02/apache/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.02/fpm-alpine/entrypoint.sh b/2022.02/fpm-alpine/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.02/fpm-alpine/entrypoint.sh +++ b/2022.02/fpm-alpine/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.02/fpm/entrypoint.sh b/2022.02/fpm/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.02/fpm/entrypoint.sh +++ b/2022.02/fpm/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.05-dev/apache/entrypoint.sh b/2022.05-dev/apache/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.05-dev/apache/entrypoint.sh +++ b/2022.05-dev/apache/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.05-dev/fpm-alpine/entrypoint.sh b/2022.05-dev/fpm-alpine/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.05-dev/fpm-alpine/entrypoint.sh +++ b/2022.05-dev/fpm-alpine/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/2022.05-dev/fpm/entrypoint.sh b/2022.05-dev/fpm/entrypoint.sh index ce76805..cfe9850 100755 --- a/2022.05-dev/fpm/entrypoint.sh +++ b/2022.05-dev/fpm/entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ce76805..cfe9850 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,8 +3,9 @@ set -eu # run an command with the www-data user run_as() { + set -- -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - su -p www-data -s /bin/sh -c "$1" + su - www-data -s /bin/sh -c "export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}; export PHP_UPLOAD_LIMIT=${PHP_UPLOAD_LIMIT}; $1" else sh -c "$1" fi