From a0aa33fe4fe33b8f85103e93107202021f159c66 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Thu, 14 Dec 2023 17:29:46 +0100
Subject: [PATCH] use alpine 3.19 and php-fpm 8.3

---
 .gitea/workflows/container.yaml                      | 12 ++++++++++++
 .woodpecker.yml                                      | 11 -----------
 Containerfile                                        |  5 +++++
 Dockerfile                                           |  5 -----
 rootfs/etc/confd/conf.d/00_memory_limit.ini.toml     |  2 +-
 .../etc/confd/conf.d/01_max_execution_time.ini.toml  |  2 +-
 rootfs/etc/confd/conf.d/02_opcache.ini.toml          |  2 +-
 rootfs/etc/confd/conf.d/www.conf.toml                |  2 +-
 rootfs/etc/{php82 => php83}/php-fpm.conf             |  0
 rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run           |  2 +-
 10 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 .gitea/workflows/container.yaml
 delete mode 100644 .woodpecker.yml
 create mode 100644 Containerfile
 delete mode 100644 Dockerfile
 rename rootfs/etc/{php82 => php83}/php-fpm.conf (100%)

diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml
new file mode 100644
index 0000000..e48b3fd
--- /dev/null
+++ b/.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 }}
diff --git a/.woodpecker.yml b/.woodpecker.yml
deleted file mode 100644
index 5a8f60a..0000000
--- a/.woodpecker.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-pipeline:
-  publish-docker-image:
-    image: plugins/kaniko
-    settings:
-      repo: docker.io/thallian/php8-fpm
-      tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre}
-      dockerfile: Dockerfile
-      username:
-        from_secret: DOCKER_USER
-      password:
-        from_secret: DOCKER_PW
\ No newline at end of file
diff --git a/Containerfile b/Containerfile
new file mode 100644
index 0000000..0482da7
--- /dev/null
+++ b/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 /
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index fd22acb..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM docker.io/thallian/confd-env:3.18-3.1.5.0
-
-RUN apk --no-cache add php82-fpm
-
-ADD /rootfs /
diff --git a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
index 61e0c69..777bd9d 100644
--- a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
+++ b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "00_memory_limit.ini.tmpl"
-dest = "/etc/php82/conf.d/00_memory_limit.ini"
+dest = "/etc/php83/conf.d/00_memory_limit.ini"
diff --git a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
index 1db31ea..f8c1982 100644
--- a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml
+++ b/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/php82/conf.d/01_max_execution_time.ini"
+dest = "/etc/php83/conf.d/01_max_execution_time.ini"
diff --git a/rootfs/etc/confd/conf.d/02_opcache.ini.toml b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
index 967d436..229cbb6 100644
--- a/rootfs/etc/confd/conf.d/02_opcache.ini.toml
+++ b/rootfs/etc/confd/conf.d/02_opcache.ini.toml
@@ -1,3 +1,3 @@
 [template]
 src = "02_opcache.ini.tmpl"
-dest = "/etc/php82/conf.d/02_opcache.ini"
+dest = "/etc/php83/conf.d/02_opcache.ini"
diff --git a/rootfs/etc/confd/conf.d/www.conf.toml b/rootfs/etc/confd/conf.d/www.conf.toml
index 8aae8db..5fa47c8 100644
--- a/rootfs/etc/confd/conf.d/www.conf.toml
+++ b/rootfs/etc/confd/conf.d/www.conf.toml
@@ -1,3 +1,3 @@
 [template]
 src = "www.conf.tmpl"
-dest = "/etc/php82/php-fpm.d/www.conf"
+dest = "/etc/php83/php-fpm.d/www.conf"
diff --git a/rootfs/etc/php82/php-fpm.conf b/rootfs/etc/php83/php-fpm.conf
similarity index 100%
rename from rootfs/etc/php82/php-fpm.conf
rename to rootfs/etc/php83/php-fpm.conf
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
index fb499d9..a849bc5 100644
--- a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec php-fpm82 --nodaemonize --force-stderr
+exec php-fpm83 --nodaemonize --force-stderr