friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-04 10:03:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #188 from nupplaphil/bug/memory_limit

Browse source 
Preserve environment variables at run_as
This commit is contained in:
Tobias Diekershoff 2022-02-09 07:53:41 +01:00 committed by GitHub
commit fc62b7454c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 53 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
2021.09/apache/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

5
2021.09/apache/entrypoint.sh
View file

@ -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
}

6
2021.09/fpm-alpine/Dockerfile
View file

@ -120,9 +120,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

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

@ -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
}

6
2021.09/fpm/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

5
2021.09/fpm/entrypoint.sh
View file

@ -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
}

6
2022.02/apache/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

5
2022.02/apache/entrypoint.sh
View file

@ -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
}

6
2022.02/fpm-alpine/Dockerfile
View file

@ -120,9 +120,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

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

@ -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
}

6
2022.02/fpm/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

5
2022.02/fpm/entrypoint.sh
View file

@ -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
}

6
2022.05-dev/apache/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

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

@ -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
}

6
2022.05-dev/fpm-alpine/Dockerfile
View file

@ -120,9 +120,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

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

@ -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
}

6
2022.05-dev/fpm/Dockerfile
View file

@ -139,9 +139,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

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

@ -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
}

6
Dockerfile-alpine.template
View file

@ -119,9 +119,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

6
Dockerfile-debian.template
View file

@ -138,9 +138,9 @@ RUN set -ex; \
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \
\
mkdir /var/www/data; \

5
docker-entrypoint.sh
View file

@ -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
}