From 43bc72769649584863f8a90666e3cd1465bd7758 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 9 Feb 2022 03:01:35 +0100 Subject: [PATCH] Preserve environment variable at `run_as` --- 2021.09/apache/entrypoint.sh | 5 ++--- 2021.09/fpm-alpine/entrypoint.sh | 5 ++--- 2021.09/fpm/entrypoint.sh | 5 ++--- 2022.02/apache/entrypoint.sh | 5 ++--- 2022.02/fpm-alpine/entrypoint.sh | 5 ++--- 2022.02/fpm/entrypoint.sh | 5 ++--- 2022.05-dev/apache/entrypoint.sh | 5 ++--- 2022.05-dev/fpm-alpine/entrypoint.sh | 5 ++--- 2022.05-dev/fpm/entrypoint.sh | 5 ++--- docker-entrypoint.sh | 5 ++--- 10 files changed, 20 insertions(+), 30 deletions(-) diff --git a/2021.09/apache/entrypoint.sh b/2021.09/apache/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2021.09/apache/entrypoint.sh +++ b/2021.09/apache/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2021.09/fpm-alpine/entrypoint.sh b/2021.09/fpm-alpine/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2021.09/fpm-alpine/entrypoint.sh +++ b/2021.09/fpm-alpine/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2021.09/fpm/entrypoint.sh b/2021.09/fpm/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2021.09/fpm/entrypoint.sh +++ b/2021.09/fpm/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.02/apache/entrypoint.sh b/2022.02/apache/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.02/apache/entrypoint.sh +++ b/2022.02/apache/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.02/fpm-alpine/entrypoint.sh b/2022.02/fpm-alpine/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.02/fpm-alpine/entrypoint.sh +++ b/2022.02/fpm-alpine/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.02/fpm/entrypoint.sh b/2022.02/fpm/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.02/fpm/entrypoint.sh +++ b/2022.02/fpm/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.05-dev/apache/entrypoint.sh b/2022.05-dev/apache/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.05-dev/apache/entrypoint.sh +++ b/2022.05-dev/apache/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.05-dev/fpm-alpine/entrypoint.sh b/2022.05-dev/fpm-alpine/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.05-dev/fpm-alpine/entrypoint.sh +++ b/2022.05-dev/fpm-alpine/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/2022.05-dev/fpm/entrypoint.sh b/2022.05-dev/fpm/entrypoint.sh index 0739dd4..3d324f2 100755 --- a/2022.05-dev/fpm/entrypoint.sh +++ b/2022.05-dev/fpm/entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi } diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0739dd4..3d324f2 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,11 +3,10 @@ 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 - www-data -s /bin/sh "$@" + su -p www-data -s /bin/sh -c "$1" else - sh "$@" + sh -c "$1" fi }