attempt to upgrade to php8.3

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
           context: cli/
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/digital-entropy/dokar-php/cli:8.2
+          tags: ghcr.io/digital-entropy/dokar-php/cli:8.3
 
   build-fpm:
     needs: build-cli
@@ -60,7 +60,7 @@ jobs:
           context: fpm/
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/digital-entropy/dokar-php/fpm:8.2
+          tags: ghcr.io/digital-entropy/dokar-php/fpm:8.3
 
   build-octane:
     needs: build-cli
@@ -89,7 +89,7 @@ jobs:
           context: octane/
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/digital-entropy/dokar-php/octane:8.2
+          tags: ghcr.io/digital-entropy/dokar-php/octane:8.3
 
   build-nginx:
     needs: build-fpm
@@ -118,4 +118,4 @@ jobs:
           context: nginx/
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/digital-entropy/dokar-php/nginx:8.2
+          tags: ghcr.io/digital-entropy/dokar-php/nginx:8.3

cli/Dockerfile

@@ -20,13 +20,13 @@ RUN apt-get update \
     && gpg --export 0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c > /usr/share/keyrings/ppa_ondrej_php.gpg \
     && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
     && apt-get update \
-    && apt-get install -y php8.2-cli php8.2-dev \
-       php8.2-pgsql php8.2-sqlite3 php8.2-gd \
-       php8.2-curl \
-       php8.2-imap php8.2-mysql php8.2-mbstring \
-       php8.2-xml php8.2-zip php8.2-bcmath php8.2-soap \
-       php8.2-intl php8.2-readline \
-       php8.2-ldap php8.2-redis \
+    && apt-get install -y php8.3-cli php8.3-dev \
+       php8.3-pgsql php8.3-sqlite3 php8.3-gd \
+       php8.3-curl \
+       php8.3-imap php8.3-mysql php8.3-mbstring \
+       php8.3-xml php8.3-zip php8.3-bcmath php8.3-soap \
+       php8.3-intl php8.3-readline \
+       php8.3-ldap php8.3-redis \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && composer global require --quiet --no-ansi laravel/envoy \
     && composer clear-cache --quiet \

fpm/Dockerfile

@@ -1,16 +1,16 @@
-FROM ghcr.io/digital-entropy/dokar-php/cli:8.2
+FROM ghcr.io/digital-entropy/dokar-php/cli:8.3
 
 LABEL org.opencontainers.image.source https://github.com/digital-entropy/dokar-php
 
 # Install FPM
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
-    && apt-get -y --no-install-recommends install php8.2-fpm \
+    && apt-get -y --no-install-recommends install php8.3-fpm \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # PHP-FPM packages need a nudge to make them docker-friendly
-COPY overrides.conf /etc/php/8.2/fpm/pool.d/z-overrides.conf
+COPY overrides.conf /etc/php/8.3/fpm/pool.d/z-overrides.conf
 
 # PHP-FPM has really dirty logs, certainly not good for dockerising
 # The following startup script contains some magic to clean these up

fpm/php-fpm-startup

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-/usr/sbin/php-fpm8.2 -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1
+/usr/sbin/php-fpm8.3 -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1

nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/digital-entropy/dokar-php/fpm:8.2
+FROM ghcr.io/digital-entropy/dokar-php/fpm:8.3
 
 LABEL org.opencontainers.image.source https://github.com/digital-entropy/dokar-php
 
@@ -29,8 +29,8 @@ ONBUILD ENV PGID ${PGID}
 ONBUILD RUN if ! grep -q $PGID /etc/group; then groupadd -g ${PGID} ${USER_CONTAINER}; fi && \
     useradd --gid ${PGID} --uid ${PUID} -m ${USER_CONTAINER}
 
-ONBUILD RUN sed -i "/^\[www\]/a group=${USER_CONTAINER}" /etc/php/8.2/fpm/pool.d/z-overrides.conf && \
-    sed -i "/^\[www\]/a user=${USER_CONTAINER}" /etc/php/8.2/fpm/pool.d/z-overrides.conf
+ONBUILD RUN sed -i "/^\[www\]/a group=${USER_CONTAINER}" /etc/php/8.3/fpm/pool.d/z-overrides.conf && \
+    sed -i "/^\[www\]/a user=${USER_CONTAINER}" /etc/php/8.3/fpm/pool.d/z-overrides.conf
 
 EXPOSE 80
 

octane/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/digital-entropy/dokar-php/cli:8.2
+FROM ghcr.io/digital-entropy/dokar-php/cli:8.3
 
 LABEL org.opencontainers.image.source https://github.com/digital-entropy/dokar-php
 
@@ -14,7 +14,7 @@ RUN apt-get update \
 RUN pecl channel-update https://pecl.php.net/channel.xml
 RUN pecl install swoole
 
-COPY 20-extra.ini /etc/php/8.2/cli/conf.d/20-extra.ini
+COPY 20-extra.ini /etc/php/8.3/cli/conf.d/20-extra.ini
 COPY runner.sh /runner.sh
 
 # cleaning...