Dokuwiki 2022-07-31a (#47)

Co-authored-by: CrazyMax <[email protected]>

Author: crazy-max

Dockerfile

@@ -1,8 +1,8 @@
-ARG DOKUWIKI_VERSION="2020-07-29"
-ARG DOKUWIKI_MD5="8867b6a5d71ecb5203402fe5e8fa18c9"
+ARG DOKUWIKI_VERSION="2022-07-31a"
+ARG DOKUWIKI_MD5="4459ea99e3a4ce2b767482f505724dcc"
 
 FROM crazymax/yasu:latest AS yasu
-FROM crazymax/alpine-s6:3.14-2.2.0.3
+FROM crazymax/alpine-s6:3.16-2.2.0.3
 
 COPY --from=yasu / /
 RUN apk --update --no-cache add \
@@ -11,25 +11,25 @@ RUN apk --update --no-cache add \
     inotify-tools \
     libgd \
     nginx \
-    php7 \
-    php7-cli \
-    php7-ctype \
-    php7-curl \
-    php7-fpm \
-    php7-gd \
-    php7-json \
-    php7-ldap \
-    php7-mbstring \
-    php7-openssl \
-    php7-pdo \
-    php7-pdo_sqlite \
-    php7-pecl-imagick \
-    php7-session \
-    php7-simplexml \
-    php7-sqlite3 \
-    php7-xml \
-    php7-zip \
-    php7-zlib \
+    php8 \
+    php8-cli \
+    php8-ctype \
+    php8-curl \
+    php8-fpm \
+    php8-gd \
+    php8-json \
+    php8-ldap \
+    php8-mbstring \
+    php8-openssl \
+    php8-pdo \
+    php8-pdo_sqlite \
+    php8-pecl-imagick \
+    php8-session \
+    php8-simplexml \
+    php8-sqlite3 \
+    php8-xml \
+    php8-zip \
+    php8-zlib \
     shadow \
     tar \
     tzdata \

rootfs/etc/cont-init.d/00-fix-logs.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv sh
+# shellcheck shell=sh
 
 # Fix access rights to stdout and stderr
 chown ${PUID}:${PGID} /proc/self/fd/1 /proc/self/fd/2 || true

rootfs/etc/cont-init.d/01-fix-uidgid.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv sh
+# shellcheck shell=sh
 
 if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g dokuwiki)" ]; then
   echo "Switching to PGID ${PGID}..."

rootfs/etc/cont-init.d/02-fix-perms.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv sh
+# shellcheck shell=sh
 
 echo "Fixing perms..."
 mkdir -p /data \
@@ -10,7 +11,7 @@ chown -R dokuwiki. \
   /tpls \
   /var/lib/nginx \
   /var/log/nginx \
-  /var/log/php7 \
+  /var/log/php8 \
   /var/run/nginx \
   /var/run/php-fpm \
   /var/www/bin \

rootfs/etc/cont-init.d/03-config.sh

@@ -26,17 +26,17 @@ echo "Setting PHP-FPM configuration..."
 sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
   -e "s/@UPLOAD_MAX_SIZE@/$UPLOAD_MAX_SIZE/g" \
   -e "s/@CLEAR_ENV@/$CLEAR_ENV/g" \
-  /tpls/etc/php7/php-fpm.d/www.conf > /etc/php7/php-fpm.d/www.conf
+  /tpls/etc/php8/php-fpm.d/www.conf > /etc/php8/php-fpm.d/www.conf
 
 echo "Setting PHP INI configuration..."
-sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php7/php.ini
-sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php7/php.ini
-sed -i "s|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|g" /etc/php7/php.ini
+sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php8/php.ini
+sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php8/php.ini
+sed -i "s|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|g" /etc/php8/php.ini
 
 # OpCache
 echo "Setting OpCache configuration..."
 sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
-  /tpls/etc/php7/conf.d/opcache.ini > /etc/php7/conf.d/opcache.ini
+  /tpls/etc/php8/conf.d/opcache.ini > /etc/php8/conf.d/opcache.ini
 
 # Nginx
 echo "Setting Nginx configuration..."
@@ -121,5 +121,5 @@ if [ ${firstInstall} -eq 1 ]; then
   echo ">>"
 elif [ "$DOKUWIKI_RUN_INDEXER" = "true" ]; then
   echo "Launching DokuWiki indexer..."
-  runas_user php7 /var/www/bin/indexer.php -c
+  runas_user php /var/www/bin/indexer.php -c
 fi

rootfs/etc/cont-init.d/04-create-services.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv sh
+# shellcheck shell=sh
 
 mkdir -p /etc/services.d/nginx
 cat > /etc/services.d/nginx/run <<EOL
@@ -14,7 +15,7 @@ cat > /etc/services.d/php-fpm/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 s6-setuidgid ${PUID}:${PGID}
-php-fpm7 -F
+php-fpm8 -F
 EOL
 chmod +x /etc/services.d/php-fpm/run
 

rootfs/tpls/etc/nginx/nginx.conf

@@ -58,7 +58,7 @@ http {
         location ~ ^/(status|ping)$ {
             allow 127.0.0.1;
             deny all;
-            fastcgi_pass unix:/var/run/php-fpm/php-fpm7.sock;
+            fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
             fastcgi_param SCRIPT_FILENAME $fastcgi_script_name;
             include fastcgi_params;
         }
@@ -90,7 +90,7 @@ http {
 
         location ~ \.php$ {
             try_files $uri =404;
-            fastcgi_pass unix:/var/run/php-fpm/php-fpm7.sock;
+            fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             include fastcgi_params;

rootfs/tpls/etc/php7/conf.d/opcache.ini renamed to rootfs/tpls/etc/php8/conf.d/opcache.ini

@@ -1,10 +1,10 @@
 [global]
-pid = /var/run/php-fpm/php-fpm7.pid
+pid = /var/run/php-fpm/php-fpm.pid
 daemonize = no
 error_log = /proc/self/fd/2
 
 [www]
-listen = /var/run/php-fpm/php-fpm7.sock
+listen = /var/run/php-fpm/php-fpm.sock
 access.log = /dev/null
 
 pm = dynamic