Parcourir la source

remove some garbage

ksieren il y a 3 ans
Parent
commit
3696e9a3ed
2 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 2 1
      Dockerfile
  2. 5 5
      rootfs/etc/service/php/run

+ 2 - 1
Dockerfile

@@ -61,7 +61,8 @@ RUN apk --no-cache add \
 # Make sure files/folders needed by the processes are accessable when they run under the nobody user
 # Make sure files/folders needed by the processes are accessable when they run under the nobody user
     && chown -R nobody.nobody /run \
     && chown -R nobody.nobody /run \
     && chown -R nobody.nobody /var/lib/nginx \
     && chown -R nobody.nobody /var/lib/nginx \
-    && chown -R nobody.nobody /var/log/nginx
+    && chown -R nobody.nobody /var/log/nginx \
+    && chown -R nobody.nobody /var/log/php7
 
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
 
 

+ 5 - 5
rootfs/etc/service/php/run

@@ -2,13 +2,13 @@
 
 
 # Replace ENV vars in configuration files
 # Replace ENV vars in configuration files
 tmpfile=$(mktemp)
 tmpfile=$(mktemp)
-cat /etc/php81/conf.d/custom.ini | envsubst "$(env | cut -d= -f1 | sed -e 's/^/$/')" | tee "$tmpfile" > /dev/null
-mv "$tmpfile" /etc/php81/conf.d/custom.ini
+cat /etc/php7/conf.d/custom.ini | envsubst "$(env | cut -d= -f1 | sed -e 's/^/$/')" | tee "$tmpfile" > /dev/null
+mv "$tmpfile" /etc/php7/conf.d/custom.ini
 
 
 tmpfile=$(mktemp)
 tmpfile=$(mktemp)
-cat /etc/php81/php-fpm.d/www.conf | envsubst "$(env | cut -d= -f1 | sed -e 's/^/$/')" | tee "$tmpfile" > /dev/null
-mv "$tmpfile" /etc/php81/php-fpm.d/www.conf
+cat /etc/php7/php-fpm.d/www.conf | envsubst "$(env | cut -d= -f1 | sed -e 's/^/$/')" | tee "$tmpfile" > /dev/null
+mv "$tmpfile" /etc/php7/php-fpm.d/www.conf
 
 
 # pipe stderr to stdout and run php-fpm
 # pipe stderr to stdout and run php-fpm
 exec 2>&1
 exec 2>&1
-exec php-fpm81 -F
+exec php-fpm7 -F