friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-01-07 18:52:39 +01:00
Code Issues Releases Wiki Activity

Merge pull request #198 from nupplaphil/bug/sh_2

Browse source 
Replace su with gosu
(self-merging to accelerate the docker image fixup)
This commit is contained in:
Philipp Holzer 2022-02-16 21:46:53 +01:00 committed by GitHub
commit 102d52108b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
2021.09/apache/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2021.09/fpm-alpine/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2021.09/fpm/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.02/apache/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.02/fpm-alpine/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.02/fpm/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.05-dev/apache/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.05-dev/fpm-alpine/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
2022.05-dev/fpm/entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter

7
docker-entrypoint.sh
View file

@ -3,12 +3,11 @@ set -eu
# run an command with the www-data user # run an command with the www-data user
run_as() { run_as() {
set -- -c "cd /var/www/html; $*" set -- sh -c "cd /var/www/html; $*"
if [ "$(id -u)" -eq 0 ]; then 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" set -- gosu www-data "$@"
else
sh -c "$1"
fi fi
"$@"
} }
# checks if the the first parameter is greater than the second parameter # checks if the the first parameter is greater than the second parameter