Merge pull request #69 from crazy-max/php-8.3

PHP 8.3

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG DOKUWIKI_VERSION="2024-02-06b"
-ARG ALPINE_VERSION="3.19"
+ARG ALPINE_VERSION="3.21"
 
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS src
 RUN apk --update --no-cache add wget tar
@@ -18,27 +18,27 @@ RUN apk --update --no-cache add \
     inotify-tools \
     libgd \
     nginx \
-    php82 \
-    php82-cli \
-    php82-ctype \
-    php82-curl \
-    php82-dom \
-    php82-fpm \
-    php82-gd \
-    php82-iconv \
-    php82-json \
-    php82-ldap \
-    php82-mbstring \
-    php82-openssl \
-    php82-pdo \
-    php82-pdo_sqlite \
-    php82-pecl-imagick \
-    php82-session \
-    php82-simplexml \
-    php82-sqlite3 \
-    php82-xml \
-    php82-zip \
-    php82-zlib \
+    php83 \
+    php83-cli \
+    php83-ctype \
+    php83-curl \
+    php83-dom \
+    php83-fpm \
+    php83-gd \
+    php83-iconv \
+    php83-json \
+    php83-ldap \
+    php83-mbstring \
+    php83-openssl \
+    php83-pdo \
+    php83-pdo_sqlite \
+    php83-pecl-imagick \
+    php83-session \
+    php83-simplexml \
+    php83-sqlite3 \
+    php83-xml \
+    php83-zip \
+    php83-zlib \
     shadow \
     tar \
     tzdata \

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

@@ -5,13 +5,13 @@ echo "Fixing perms..."
 mkdir -p /data \
   /var/run/nginx \
   /var/run/php-fpm
-chown dokuwiki. \
+chown dokuwiki:dokuwiki \
   /data
-chown -R dokuwiki. \
+chown -R dokuwiki:dokuwiki \
   /tpls \
   /var/lib/nginx \
   /var/log/nginx \
-  /var/log/php82 \
+  /var/log/php83 \
   /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/php82/php-fpm.d/www.conf > /etc/php82/php-fpm.d/www.conf
+  /tpls/etc/php83/php-fpm.d/www.conf > /etc/php83/php-fpm.d/www.conf
 
 echo "Setting PHP INI configuration..."
-sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini
-sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini
-sed -i "s|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|g" /etc/php82/php.ini
+sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php83/php.ini
+sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php83/php.ini
+sed -i "s|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|g" /etc/php83/php.ini
 
 # OpCache
 echo "Setting OpCache configuration..."
 sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
-  /tpls/etc/php82/conf.d/opcache.ini > /etc/php82/conf.d/opcache.ini
+  /tpls/etc/php83/conf.d/opcache.ini > /etc/php83/conf.d/opcache.ini
 
 # Nginx
 echo "Setting Nginx configuration..."

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

@@ -15,7 +15,7 @@ cat > /etc/services.d/php-fpm/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 s6-setuidgid ${PUID}:${PGID}
-php-fpm82 -F
+php-fpm83 -F
 EOL
 chmod +x /etc/services.d/php-fpm/run