aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-19 18:36:09 +02:00
Code Activity

Revert "Configure pm.max_children from env var"

Browse source 
This reverts commit 4ce703efa64958f8e719575af899ba57c32f104b.

Signed-off-by: Thomas Clavier <tom@tcweb.org>
This commit is contained in:
Thomas Clavier 2023-10-26 11:26:53 +02:00
parent 1bf2e95f05
commit 6a301fb1d6
No known key found for this signature in database
GPG key ID: 20CCE23E53E6E41A
7 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
25/apache/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -109,7 +108,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
25/fpm/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -109,7 +108,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
26/apache/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -110,7 +109,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
26/fpm/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -110,7 +109,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
27/apache/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -110,7 +109,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
27/fpm/Dockerfile
View file

@ -21,7 +21,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -110,7 +109,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \

2
Dockerfile-debian.template
View file

@ -20,7 +20,6 @@ RUN set -ex; \
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
ENV PHP_MEMORY_LIMIT 512M ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 512M ENV PHP_UPLOAD_LIMIT 512M
ENV PHP_PM_MAX_CHILDREN 16
RUN set -ex; \ RUN set -ex; \
\ \
savedAptMark="$(apt-mark showmanual)"; \ savedAptMark="$(apt-mark showmanual)"; \
@ -109,7 +108,6 @@ RUN { \
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}'; \
echo 'pm.max_children = ${PHP_PM_MAX_CHILDREN}'; \
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
\ \
mkdir /var/www/data; \ mkdir /var/www/data; \