Compare commits

..

No commits in common. "main" and "3.17" have entirely different histories.
main ... 3.17

10 changed files with 23 additions and 24 deletions

View File

@ -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 }}

11
.woodpecker.yml Normal file
View File

@ -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

View File

@ -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 /

5
Dockerfile Normal file
View File

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

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

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