From 6a02b60ce2b7e77aad13ef75ce679ea0dcaaaad7 Mon Sep 17 00:00:00 2001
From: Alexander Sosna <alexander.sosna@credativ.de>
Date: Thu, 14 Jan 2021 18:53:04 +0100
Subject: [PATCH] Run update.sh

---
 18.0/apache/Dockerfile             | 2 +-
 18.0/apache/entrypoint.sh          | 7 +++++++
 18.0/fpm-alpine/Dockerfile         | 3 ++-
 18.0/fpm-alpine/entrypoint.sh      | 7 +++++++
 18.0/fpm/Dockerfile                | 2 +-
 18.0/fpm/entrypoint.sh             | 7 +++++++
 19.0/apache/Dockerfile             | 2 +-
 19.0/apache/entrypoint.sh          | 7 +++++++
 19.0/fpm-alpine/Dockerfile         | 3 ++-
 19.0/fpm-alpine/entrypoint.sh      | 7 +++++++
 19.0/fpm/Dockerfile                | 2 +-
 19.0/fpm/entrypoint.sh             | 7 +++++++
 20.0/apache/Dockerfile             | 2 +-
 20.0/apache/entrypoint.sh          | 7 +++++++
 20.0/fpm-alpine/Dockerfile         | 3 ++-
 20.0/fpm-alpine/entrypoint.sh      | 7 +++++++
 20.0/fpm/Dockerfile                | 2 +-
 20.0/fpm/entrypoint.sh             | 7 +++++++
 21.0-beta/apache/Dockerfile        | 2 +-
 21.0-beta/apache/entrypoint.sh     | 7 +++++++
 21.0-beta/fpm-alpine/Dockerfile    | 3 ++-
 21.0-beta/fpm-alpine/entrypoint.sh | 7 +++++++
 21.0-beta/fpm/Dockerfile           | 2 +-
 21.0-beta/fpm/entrypoint.sh        | 7 +++++++
 24 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/18.0/apache/Dockerfile b/18.0/apache/Dockerfile
index 59232c61..247cdc25 100644
--- a/18.0/apache/Dockerfile
+++ b/18.0/apache/Dockerfile
@@ -98,7 +98,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/18.0/apache/entrypoint.sh
+++ b/18.0/apache/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/18.0/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile
index 654994e6..aed06f7e 100644
--- a/18.0/fpm-alpine/Dockerfile
+++ b/18.0/fpm-alpine/Dockerfile
@@ -74,6 +74,7 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
+ENV PHP_INI_MEMORY_LIMIT %%PHP_INI_MEMORY_LIMIT%%
 RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=8'; \
@@ -85,7 +86,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/18.0/fpm-alpine/entrypoint.sh
+++ b/18.0/fpm-alpine/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/18.0/fpm/Dockerfile b/18.0/fpm/Dockerfile
index 9157a8c5..ac5f4ab2 100644
--- a/18.0/fpm/Dockerfile
+++ b/18.0/fpm/Dockerfile
@@ -98,7 +98,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/18.0/fpm/entrypoint.sh
+++ b/18.0/fpm/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/19.0/apache/Dockerfile b/19.0/apache/Dockerfile
index 16f7b4c9..a165dda9 100644
--- a/19.0/apache/Dockerfile
+++ b/19.0/apache/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/19.0/apache/entrypoint.sh
+++ b/19.0/apache/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/19.0/fpm-alpine/Dockerfile b/19.0/fpm-alpine/Dockerfile
index badd6629..2960c4ce 100644
--- a/19.0/fpm-alpine/Dockerfile
+++ b/19.0/fpm-alpine/Dockerfile
@@ -75,6 +75,7 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
+ENV PHP_INI_MEMORY_LIMIT %%PHP_INI_MEMORY_LIMIT%%
 RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=8'; \
@@ -86,7 +87,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/19.0/fpm-alpine/entrypoint.sh
+++ b/19.0/fpm-alpine/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/19.0/fpm/Dockerfile b/19.0/fpm/Dockerfile
index d6e7faef..1bc4d665 100644
--- a/19.0/fpm/Dockerfile
+++ b/19.0/fpm/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/19.0/fpm/entrypoint.sh
+++ b/19.0/fpm/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/20.0/apache/Dockerfile b/20.0/apache/Dockerfile
index 4a91b658..6301241e 100644
--- a/20.0/apache/Dockerfile
+++ b/20.0/apache/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/20.0/apache/entrypoint.sh b/20.0/apache/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/20.0/apache/entrypoint.sh
+++ b/20.0/apache/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/20.0/fpm-alpine/Dockerfile b/20.0/fpm-alpine/Dockerfile
index 764b1c6e..fe2ea157 100644
--- a/20.0/fpm-alpine/Dockerfile
+++ b/20.0/fpm-alpine/Dockerfile
@@ -75,6 +75,7 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
+ENV PHP_INI_MEMORY_LIMIT %%PHP_INI_MEMORY_LIMIT%%
 RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=8'; \
@@ -86,7 +87,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/20.0/fpm-alpine/entrypoint.sh b/20.0/fpm-alpine/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/20.0/fpm-alpine/entrypoint.sh
+++ b/20.0/fpm-alpine/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/20.0/fpm/Dockerfile b/20.0/fpm/Dockerfile
index f56cb5c3..55acab5e 100644
--- a/20.0/fpm/Dockerfile
+++ b/20.0/fpm/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/20.0/fpm/entrypoint.sh b/20.0/fpm/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/20.0/fpm/entrypoint.sh
+++ b/20.0/fpm/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/21.0-beta/apache/Dockerfile b/21.0-beta/apache/Dockerfile
index 7936c6d7..f0faa7d9 100644
--- a/21.0-beta/apache/Dockerfile
+++ b/21.0-beta/apache/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/21.0-beta/apache/entrypoint.sh b/21.0-beta/apache/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/21.0-beta/apache/entrypoint.sh
+++ b/21.0-beta/apache/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/21.0-beta/fpm-alpine/Dockerfile b/21.0-beta/fpm-alpine/Dockerfile
index f06c641f..7dd8cea3 100644
--- a/21.0-beta/fpm-alpine/Dockerfile
+++ b/21.0-beta/fpm-alpine/Dockerfile
@@ -75,6 +75,7 @@ RUN set -ex; \
 
 # set recommended PHP.ini settings
 # see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
+ENV PHP_INI_MEMORY_LIMIT %%PHP_INI_MEMORY_LIMIT%%
 RUN { \
         echo 'opcache.enable=1'; \
         echo 'opcache.interned_strings_buffer=8'; \
@@ -86,7 +87,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/21.0-beta/fpm-alpine/entrypoint.sh b/21.0-beta/fpm-alpine/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/21.0-beta/fpm-alpine/entrypoint.sh
+++ b/21.0-beta/fpm-alpine/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip
diff --git a/21.0-beta/fpm/Dockerfile b/21.0-beta/fpm/Dockerfile
index bcfa410d..3df54132 100644
--- a/21.0-beta/fpm/Dockerfile
+++ b/21.0-beta/fpm/Dockerfile
@@ -97,7 +97,7 @@ RUN { \
     \
     echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
     \
-    echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
+    touch /usr/local/etc/php/conf.d/memory-limit.ini; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/21.0-beta/fpm/entrypoint.sh b/21.0-beta/fpm/entrypoint.sh
index bee572c2..e0a2c8ba 100755
--- a/21.0-beta/fpm/entrypoint.sh
+++ b/21.0-beta/fpm/entrypoint.sh
@@ -43,6 +43,13 @@ file_env() {
     unset "$fileVar"
 }
 
+# Get essential PHP_INI configuration
+file_env PHP_INI_MEMORY_LIMIT 512M
+
+# Set essential PHP_INI configuration
+# It is important to set essential variables like 'memory-limit' before the first start to premvent OOM during installation and statup.
+echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > /usr/local/etc/php/conf.d/memory-limit.ini;
+
 if expr "$1" : "apache" 1>/dev/null; then
     if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
         a2disconf remoteip