diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml deleted file mode 100644 index e48b3fd..0000000 --- a/.gitea/workflows/container.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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 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 diff --git a/Containerfile b/Containerfile deleted file mode 100644 index 50cee1d..0000000 --- a/Containerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM docker.io/thallian/confd-env:3.21-3.2.0.2 - -RUN apk --no-cache add php84-fpm - -ADD /rootfs / diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..7a261c0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM docker.io/thallian/confd-env:3.17 + +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 3333da1..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/php84/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 fb44427..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/php84/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 5240fe2..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/php84/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 c32277e..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/php84/php-fpm.d/www.conf" +dest = "/etc/php81/php-fpm.d/www.conf" diff --git a/rootfs/etc/php84/php-fpm.conf b/rootfs/etc/php81/php-fpm.conf similarity index 98% rename from rootfs/etc/php84/php-fpm.conf rename to rootfs/etc/php81/php-fpm.conf index 5a5c0df..29781e4 100644 --- a/rootfs/etc/php84/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/php84-fpm.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/php84/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 222429e..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-fpm84 --nodaemonize --force-stderr +exec php-fpm81 --nodaemonize --force-stderr