From 3d5b801d6cb524d920207dcc30457b38a853d648 Mon Sep 17 00:00:00 2001 From: Alexander Sosna Date: Thu, 14 Jan 2021 18:54:56 +0100 Subject: [PATCH] Run update.sh --- 18.0/apache/entrypoint.sh | 3 ++- 18.0/fpm-alpine/entrypoint.sh | 3 ++- 18.0/fpm/entrypoint.sh | 3 ++- 19.0/apache/entrypoint.sh | 3 ++- 19.0/fpm-alpine/entrypoint.sh | 3 ++- 19.0/fpm/entrypoint.sh | 3 ++- 20.0/apache/entrypoint.sh | 3 ++- 20.0/fpm-alpine/entrypoint.sh | 3 ++- 20.0/fpm/entrypoint.sh | 3 ++- 21.0-beta/apache/entrypoint.sh | 3 ++- 21.0-beta/fpm-alpine/entrypoint.sh | 3 ++- 21.0-beta/fpm/entrypoint.sh | 3 ++- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/18.0/apache/entrypoint.sh +++ b/18.0/apache/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/18.0/fpm-alpine/entrypoint.sh +++ b/18.0/fpm-alpine/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/18.0/fpm/entrypoint.sh +++ b/18.0/fpm/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/19.0/apache/entrypoint.sh +++ b/19.0/apache/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/19.0/fpm-alpine/entrypoint.sh +++ b/19.0/fpm-alpine/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/19.0/fpm/entrypoint.sh +++ b/19.0/fpm/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/20.0/apache/entrypoint.sh b/20.0/apache/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/20.0/apache/entrypoint.sh +++ b/20.0/apache/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/20.0/fpm-alpine/entrypoint.sh b/20.0/fpm-alpine/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/20.0/fpm-alpine/entrypoint.sh +++ b/20.0/fpm-alpine/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/20.0/fpm/entrypoint.sh b/20.0/fpm/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/20.0/fpm/entrypoint.sh +++ b/20.0/fpm/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/21.0-beta/apache/entrypoint.sh b/21.0-beta/apache/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/21.0-beta/apache/entrypoint.sh +++ b/21.0-beta/apache/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/21.0-beta/fpm-alpine/entrypoint.sh b/21.0-beta/fpm-alpine/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/21.0-beta/fpm-alpine/entrypoint.sh +++ b/21.0-beta/fpm-alpine/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then diff --git a/21.0-beta/fpm/entrypoint.sh b/21.0-beta/fpm/entrypoint.sh index e0a2c8ba..9e3ddc10 100755 --- a/21.0-beta/fpm/entrypoint.sh +++ b/21.0-beta/fpm/entrypoint.sh @@ -48,7 +48,8 @@ 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; +file_memory_limit=/usr/local/etc/php/conf.d/memory-limit.ini +[ -s ${file_memory_limit} ] || echo "memory_limit=${PHP_INI_MEMORY_LIMIT}" > ${file_memory_limit} if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then