use php-fpm83 everywhere

.gitea/workflows/container.yaml

@@ -0,0 +1,12 @@
+name: Build Multiarch Container Image
+on: [push]
+jobs:
+  call-reusable-workflow:
+    uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main
+    with:
+      repository: ${{ gitea.repository }}
+      ref_name: ${{ gitea.ref_name }}
+      sha: ${{ gitea.sha }}
+      registry_url: ${{ secrets.REGISTRY_URL }}
+      registry_user: ${{ secrets.REGISTRY_USER }}
+      registry_pw: ${{ secrets.REGISTRY_PW }}

.gitlab-ci.yml

@@ -1,26 +0,0 @@
-variables:
-  CONTAINER_NAME: thallian/php8-fpm
-
-build:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - >-
-      /kaniko/executor
-      --context "$CI_PROJECT_DIR"
-      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
-      --destination "$CONTAINER_NAME:latest"
-
-downstream-nextcloud:
-  stage: .post
-  trigger: containers/nextcloud
-
-downstream-roundcube:
-  stage: .post
-  trigger: containers/roundcube

Containerfile

@@ -0,0 +1,5 @@
+FROM docker.io/thallian/confd-env:3.19-3.1.6.2
+
+RUN apk --no-cache add php83-fpm
+
+ADD /rootfs /

Dockerfile

@@ -1,6 +0,0 @@
-FROM thallian/confd-env:latest
-
-RUN apk --no-cache add php8-fpm
-RUN ln -s /usr/bin/php8 /usr/bin/php
-
-ADD /rootfs /

rootfs/etc/confd/conf.d/00_memory_limit.ini.toml

@@ -1,3 +1,3 @@
 [template]
 src = "00_memory_limit.ini.tmpl"
-dest = "/etc/php8/conf.d/00_memory_limit.ini"
+dest = "/etc/php83/conf.d/00_memory_limit.ini"

rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml

@@ -1,3 +1,3 @@
 [template]
 src = "01_max_execution_time.ini.tmpl"
-dest = "/etc/php8/conf.d/01_max_execution_time.ini"
+dest = "/etc/php83/conf.d/01_max_execution_time.ini"

rootfs/etc/confd/conf.d/02_opcache.ini.toml

@@ -1,3 +1,3 @@
 [template]
 src = "02_opcache.ini.tmpl"
-dest = "/etc/php8/conf.d/02_opcache.ini"
+dest = "/etc/php83/conf.d/02_opcache.ini"

rootfs/etc/confd/conf.d/www.conf.toml

@@ -1,3 +1,3 @@
 [template]
 src = "www.conf.tmpl"
-dest = "/etc/php8/php-fpm.d/www.conf"
+dest = "/etc/php83/php-fpm.d/www.conf"

rootfs/etc/php83/php-fpm.conf

@@ -14,7 +14,7 @@
 ; Pid file
 ; Note: the default prefix is /var
 ; Default Value: none
-;pid = run/php-fpm7.pid
+;pid = run/php83-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
@@ -122,4 +122,4 @@ error_log = syslog
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=/etc/php8/php-fpm.d/*.conf
+include=/etc/php83/php-fpm.d/*.conf

rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php-fpm8 --nodaemonize --force-stderr
+exec php-fpm83 --nodaemonize --force-stderr