Actually update php

Author: thespad

Dockerfile

@@ -20,22 +20,22 @@ RUN \
     nano \
     nginx \
     openssl \
-    php84 \
-    php84-ctype \
-    php84-curl \
-    php84-fileinfo \
-    php84-fpm \
-    php84-iconv \
-    php84-json \
-    php84-mbstring \
-    php84-openssl \
-    php84-phar \
-    php84-session \
-    php84-simplexml \
-    php84-xml \
-    php84-xmlwriter \
-    php84-zip \
-    php84-zlib && \
+    php85 \
+    php85-ctype \
+    php85-curl \
+    php85-fileinfo \
+    php85-fpm \
+    php85-iconv \
+    php85-json \
+    php85-mbstring \
+    php85-openssl \
+    php85-phar \
+    php85-session \
+    php85-simplexml \
+    php85-xml \
+    php85-xmlwriter \
+    php85-zip \
+    php85-zlib && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  HTTP_PROXY         ""; # https://httpoxy.org/' >> \
     /etc/nginx/fastcgi_params && \
@@ -48,19 +48,19 @@ RUN \
   rm -f /etc/nginx/conf.d/stream.conf && \
   rm -f /etc/nginx/http.d/default.conf && \
   echo "**** guarantee correct php version is symlinked ****" && \
-  if [ "$(readlink /usr/bin/php)" != "php84" ]; then \
+  if [ "$(readlink /usr/bin/php)" != "php85" ]; then \
     rm -rf /usr/bin/php && \
-    ln -s /usr/bin/php84 /usr/bin/php; \
+    ln -s /usr/bin/php85 /usr/bin/php; \
   fi && \
   echo "**** configure php ****" && \
-  sed -i "s#;error_log = log/php84/error.log.*#error_log = /config/log/php/error.log#g" \
-    /etc/php84/php-fpm.conf && \
+  sed -i "s#;error_log = log/php85/error.log.*#error_log = /config/log/php/error.log#g" \
+    /etc/php85/php-fpm.conf && \
   sed -i "s#user = nobody.*#user = abc#g" \
-    /etc/php84/php-fpm.d/www.conf && \
+    /etc/php85/php-fpm.d/www.conf && \
   sed -i "s#group = nobody.*#group = abc#g" \
-    /etc/php84/php-fpm.d/www.conf && \
+    /etc/php85/php-fpm.d/www.conf && \
   echo "**** add run paths to php runtime config ****" && \
-  grep -qxF 'include=/config/php/*.conf' /etc/php84/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php84/php-fpm.conf && \
+  grep -qxF 'include=/config/php/*.conf' /etc/php85/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php85/php-fpm.conf && \
   echo "**** install php composer ****" && \
   EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" && \
   php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \

Dockerfile.aarch64

@@ -20,22 +20,22 @@ RUN \
     nano \
     nginx \
     openssl \
-    php84 \
-    php84-ctype \
-    php84-curl \
-    php84-fileinfo \
-    php84-fpm \
-    php84-iconv \
-    php84-json \
-    php84-mbstring \
-    php84-openssl \
-    php84-phar \
-    php84-session \
-    php84-simplexml \
-    php84-xml \
-    php84-xmlwriter \
-    php84-zip \
-    php84-zlib && \
+    php85 \
+    php85-ctype \
+    php85-curl \
+    php85-fileinfo \
+    php85-fpm \
+    php85-iconv \
+    php85-json \
+    php85-mbstring \
+    php85-openssl \
+    php85-phar \
+    php85-session \
+    php85-simplexml \
+    php85-xml \
+    php85-xmlwriter \
+    php85-zip \
+    php85-zlib && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  HTTP_PROXY         ""; # https://httpoxy.org/' >> \
     /etc/nginx/fastcgi_params && \
@@ -48,19 +48,19 @@ RUN \
   rm -f /etc/nginx/conf.d/stream.conf && \
   rm -f /etc/nginx/http.d/default.conf && \
   echo "**** guarantee correct php version is symlinked ****" && \
-  if [ "$(readlink /usr/bin/php)" != "php84" ]; then \
+  if [ "$(readlink /usr/bin/php)" != "php85" ]; then \
     rm -rf /usr/bin/php && \
-    ln -s /usr/bin/php84 /usr/bin/php; \
+    ln -s /usr/bin/php85 /usr/bin/php; \
   fi && \
   echo "**** configure php ****" && \
-  sed -i "s#;error_log = log/php84/error.log.*#error_log = /config/log/php/error.log#g" \
-    /etc/php84/php-fpm.conf && \
+  sed -i "s#;error_log = log/php85/error.log.*#error_log = /config/log/php/error.log#g" \
+    /etc/php85/php-fpm.conf && \
   sed -i "s#user = nobody.*#user = abc#g" \
-    /etc/php84/php-fpm.d/www.conf && \
+    /etc/php85/php-fpm.d/www.conf && \
   sed -i "s#group = nobody.*#group = abc#g" \
-    /etc/php84/php-fpm.d/www.conf && \
+    /etc/php85/php-fpm.d/www.conf && \
   echo "**** add run paths to php runtime config ****" && \
-  grep -qxF 'include=/config/php/*.conf' /etc/php84/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php84/php-fpm.conf && \
+  grep -qxF 'include=/config/php/*.conf' /etc/php85/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php85/php-fpm.conf && \
   echo "**** install php composer ****" && \
   EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" && \
   php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \