From c9965262bb3dfae91189bad8f9cfb6f4fe805800 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 16 Feb 2022 21:37:41 +0100 Subject: [PATCH] Replace su with gosu --- 2021.09/apache/entrypoint.sh | 7 +++---- 2021.09/fpm-alpine/entrypoint.sh | 7 +++---- 2021.09/fpm/entrypoint.sh | 7 +++---- 2022.02/apache/entrypoint.sh | 7 +++---- 2022.02/fpm-alpine/entrypoint.sh | 7 +++---- 2022.02/fpm/entrypoint.sh | 7 +++---- 2022.05-dev/apache/entrypoint.sh | 7 +++---- 2022.05-dev/fpm-alpine/entrypoint.sh | 7 +++---- 2022.05-dev/fpm/entrypoint.sh | 7 +++---- docker-entrypoint.sh | 7 +++---- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/2021.09/apache/entrypoint.sh b/2021.09/apache/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2021.09/apache/entrypoint.sh +++ b/2021.09/apache/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2021.09/fpm-alpine/entrypoint.sh b/2021.09/fpm-alpine/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2021.09/fpm-alpine/entrypoint.sh +++ b/2021.09/fpm-alpine/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2021.09/fpm/entrypoint.sh b/2021.09/fpm/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2021.09/fpm/entrypoint.sh +++ b/2021.09/fpm/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.02/apache/entrypoint.sh b/2022.02/apache/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.02/apache/entrypoint.sh +++ b/2022.02/apache/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.02/fpm-alpine/entrypoint.sh b/2022.02/fpm-alpine/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.02/fpm-alpine/entrypoint.sh +++ b/2022.02/fpm-alpine/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.02/fpm/entrypoint.sh b/2022.02/fpm/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.02/fpm/entrypoint.sh +++ b/2022.02/fpm/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.05-dev/apache/entrypoint.sh b/2022.05-dev/apache/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.05-dev/apache/entrypoint.sh +++ b/2022.05-dev/apache/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.05-dev/fpm-alpine/entrypoint.sh b/2022.05-dev/fpm-alpine/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.05-dev/fpm-alpine/entrypoint.sh +++ b/2022.05-dev/fpm-alpine/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/2022.05-dev/fpm/entrypoint.sh b/2022.05-dev/fpm/entrypoint.sh index cfe9850..87dcbe2 100755 --- a/2022.05-dev/fpm/entrypoint.sh +++ b/2022.05-dev/fpm/entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index cfe9850..87dcbe2 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,12 +3,11 @@ set -eu # run an command with the www-data user run_as() { - set -- -c "cd /var/www/html; $*" + set -- sh -c "cd /var/www/html; $*" if [ "$(id -u)" -eq 0 ]; then - 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" + set -- gosu www-data "$@" fi + "$@" } # checks if the the first parameter is greater than the second parameter