From f53af73cf51d6afccaf6e4158dee3f607f1e0584 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 12 Jul 2022 19:43:40 +0200 Subject: [PATCH 01/10] update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d2e82f9..70f76be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM docker.io/thallian/confd-env:3.16 RUN apk --no-cache add php8-fpm RUN ln -s /usr/bin/php8 /usr/bin/php From 5dbe8780d9678643b88cae6e81c5a2927ff0ce76 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 06:45:10 +0000 Subject: [PATCH 02/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index fcc535d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -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 From 4ae965fd6239e89741a73dba34cde4c9124da3a1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 06:46:18 +0000 Subject: [PATCH 03/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..5a8f60a --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +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 From 90612dfacba39c30ebccfd35209f7cabe36d27a8 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 13:41:06 +0100 Subject: [PATCH 04/10] push to alpine 3.17 and php 8.1 --- Dockerfile | 5 ++--- rootfs/etc/confd/conf.d/00_memory_limit.ini.toml | 2 +- rootfs/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/{php8 => php81}/php-fpm.conf | 4 ++-- rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) rename rootfs/etc/{php8 => php81}/php-fpm.conf (98%) diff --git a/Dockerfile b/Dockerfile index 70f76be..7a261c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 -RUN apk --no-cache add php8-fpm -RUN ln -s /usr/bin/php8 /usr/bin/php +RUN apk --no-cache add php81-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 ec688ba..432c8a8 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/php8/conf.d/00_memory_limit.ini" +dest = "/etc/php81/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 32e5e52..7d172f5 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/php8/conf.d/01_max_execution_time.ini" +dest = "/etc/php81/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 f51cc55..e007241 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/php8/conf.d/02_opcache.ini" +dest = "/etc/php81/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 770c784..24302ca 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/php8/php-fpm.d/www.conf" +dest = "/etc/php81/php-fpm.d/www.conf" diff --git a/rootfs/etc/php8/php-fpm.conf b/rootfs/etc/php81/php-fpm.conf similarity index 98% rename from rootfs/etc/php8/php-fpm.conf rename to rootfs/etc/php81/php-fpm.conf index fdd7898..29781e4 100644 --- a/rootfs/etc/php8/php-fpm.conf +++ b/rootfs/etc/php81/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/php81-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/php81/php-fpm.d/*.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 0dc8f7e..6f6ef31 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-fpm8 --nodaemonize --force-stderr +exec php-fpm81 --nodaemonize --force-stderr From cfcd3e76d78cfdd17096bab5f857086e6733c526 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:09:19 +0200 Subject: [PATCH 05/10] use new alpine 3.18 as base --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a261c0..5625518 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.17 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 RUN apk --no-cache add php81-fpm From 776a0022f1b4c41faaa302be91a1aedd15ea4a22 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:45:42 +0200 Subject: [PATCH 06/10] update to php 8.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5625518..fd22acb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM docker.io/thallian/confd-env:3.18-3.1.5.0 -RUN apk --no-cache add php81-fpm +RUN apk --no-cache add php82-fpm ADD /rootfs / From dd7ab5fd9f94e53cc7157c8e0235649285e16acf Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:54:19 +0200 Subject: [PATCH 07/10] use php 8.2 base --- rootfs/etc/confd/conf.d/00_memory_limit.ini.toml | 2 +- rootfs/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/{php81 => php82}/php-fpm.conf | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename rootfs/etc/{php81 => php82}/php-fpm.conf (98%) 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 432c8a8..61e0c69 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/php81/conf.d/00_memory_limit.ini" +dest = "/etc/php82/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 7d172f5..1db31ea 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/php81/conf.d/01_max_execution_time.ini" +dest = "/etc/php82/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 e007241..967d436 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/php81/conf.d/02_opcache.ini" +dest = "/etc/php82/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 24302ca..8aae8db 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/php81/php-fpm.d/www.conf" +dest = "/etc/php82/php-fpm.d/www.conf" diff --git a/rootfs/etc/php81/php-fpm.conf b/rootfs/etc/php82/php-fpm.conf similarity index 98% rename from rootfs/etc/php81/php-fpm.conf rename to rootfs/etc/php82/php-fpm.conf index 29781e4..39b0c3b 100644 --- a/rootfs/etc/php81/php-fpm.conf +++ b/rootfs/etc/php82/php-fpm.conf @@ -14,7 +14,7 @@ ; Pid file ; Note: the default prefix is /var ; Default Value: none -;pid = run/php81-fpm.pid +;pid = run/php82-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/php81/php-fpm.d/*.conf +include=/etc/php82/php-fpm.d/*.conf From 9dde9649ddc4023caf394decc961ce1d5c1c5def Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 11:02:02 +0200 Subject: [PATCH 08/10] use php 8.2 base --- rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f6ef31..fb499d9 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-fpm81 --nodaemonize --force-stderr +exec php-fpm82 --nodaemonize --force-stderr From a0aa33fe4fe33b8f85103e93107202021f159c66 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 17:29:46 +0100 Subject: [PATCH 09/10] 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 From 8a19eaba9285bf2393b410334de6a9d6c2831f65 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 14 Dec 2023 21:41:54 +0100 Subject: [PATCH 10/10] use php-fpm83 everywhere --- rootfs/etc/php83/php-fpm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/etc/php83/php-fpm.conf b/rootfs/etc/php83/php-fpm.conf index 39b0c3b..1947ddf 100644 --- a/rootfs/etc/php83/php-fpm.conf +++ b/rootfs/etc/php83/php-fpm.conf @@ -14,7 +14,7 @@ ; Pid file ; Note: the default prefix is /var ; Default Value: none -;pid = run/php82-fpm.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/php82/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf