mirror of
https://github.com/friendica/docker
synced 2024-06-22 04:34:41 +02:00
Merge pull request #188 from nupplaphil/bug/memory_limit
Preserve environment variables at run_as
This commit is contained in:
commit
fc62b7454c
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,9 +120,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,9 +120,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,9 +120,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,9 +139,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,9 +119,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -138,9 +138,9 @@ RUN set -ex; \
|
||||||
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
|
||||||
\
|
\
|
||||||
{ \
|
{ \
|
||||||
echo "memory_limit=${PHP_MEMORY_LIMIT}"; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo "upload_max_filesize=${PHP_UPLOAD_LIMIT}"; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
echo "post_max_size=${PHP_UPLOAD_LIMIT}"; \
|
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
|
||||||
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
} > /usr/local/etc/php/conf.d/friendica.ini; \
|
||||||
\
|
\
|
||||||
mkdir /var/www/data; \
|
mkdir /var/www/data; \
|
||||||
|
|
|
@ -3,11 +3,10 @@ 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; $*"
|
|
||||||
if [ "$(id -u)" -eq 0 ]; then
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
su - www-data -s /bin/sh "$@"
|
su -p www-data -s /bin/sh -c "$1"
|
||||||
else
|
else
|
||||||
sh "$@"
|
sh -c "$1"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue