From c95dfae28660a9bd41161dd30ba97099a5c2695d Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 11 Jul 2025 13:27:09 +0100 Subject: [PATCH] Fix php conf --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7935364..ea79b6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN \ /usr/bin && \ echo "**** configure php-fpm to pass env vars ****" && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "*** install speedtest-tracker ***" && \ if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 16b39fb..c987970 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -39,7 +39,7 @@ RUN \ /usr/bin && \ echo "**** configure php-fpm to pass env vars ****" && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "*** install speedtest-tracker ***" && \ if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \