Skip to content

Commit 37d0a6b

Browse files
authored
Merge pull request #44 from linuxserver/php-conf
2 parents 22ee426 + 87834f7 commit 37d0a6b

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN \
3030
php84-tokenizer && \
3131
echo "**** configure php-fpm to pass env vars ****" && \
3232
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
33-
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
33+
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 && \
3434
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
3535
echo "**** setup php opcache ****" && \
3636
{ \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN \
3030
php84-tokenizer && \
3131
echo "**** configure php-fpm to pass env vars ****" && \
3232
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
33-
grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
33+
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 && \
3434
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
3535
echo "**** setup php opcache ****" && \
3636
{ \

0 commit comments

Comments
 (0)