Skip to content

Commit 7c77b0a

Browse files
authored
Merge pull request linuxserver#53 from linuxserver/php-conf
2 parents 10775b7 + c95dfae commit 7c77b0a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN \
3939
/usr/bin && \
4040
echo "**** configure php-fpm to pass env vars ****" && \
4141
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
42-
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
42+
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 && \
4343
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
4444
echo "*** install speedtest-tracker ***" && \
4545
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN \
3939
/usr/bin && \
4040
echo "**** configure php-fpm to pass env vars ****" && \
4141
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
42-
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
42+
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 && \
4343
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
4444
echo "*** install speedtest-tracker ***" && \
4545
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \

0 commit comments

Comments
 (0)