Skip to content

Commit cf2716d

Browse files
Tob1asTob1as
committed
changes
1 parent d61d0a4 commit cf2716d

File tree

12 files changed

+62
-454
lines changed

12 files changed

+62
-454
lines changed

‎.github/workflows/build_docker-alpine_fpm.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ jobs:
146146
tags: |
147147
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim
148148
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim-${{env.COMMIT_HASH}}
149+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim
150+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim-${{env.COMMIT_HASH}}
149151
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim
150-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim
152+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-slim-${{env.COMMIT_HASH}}
151153

152154

153155
# --------------------------------------------------
@@ -210,8 +212,10 @@ jobs:
210212
tags: |
211213
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine
212214
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-${{env.COMMIT_HASH}}
215+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine
216+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-${{env.COMMIT_HASH}}
213217
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine
214-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine
218+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-${{env.COMMIT_HASH}}
215219

216220

217221
# --------------------------------------------------
@@ -274,5 +278,7 @@ jobs:
274278
tags: |
275279
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc
276280
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc-${{env.COMMIT_HASH}}
281+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc
282+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc-${{env.COMMIT_HASH}}
277283
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc
278-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc
284+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-alpine-wsc-${{env.COMMIT_HASH}}

‎.github/workflows/build_docker-alpine_fpm_nginx.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ jobs:
147147
tags: |
148148
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim
149149
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim-${{env.COMMIT_HASH}}
150+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim
151+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim-${{env.COMMIT_HASH}}
150152
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim
151-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim
153+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-slim-${{env.COMMIT_HASH}}
152154

153155

154156
# --------------------------------------------------
@@ -211,8 +213,10 @@ jobs:
211213
tags: |
212214
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine
213215
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-${{env.COMMIT_HASH}}
216+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine
217+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-${{env.COMMIT_HASH}}
214218
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine
215-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine
219+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-${{env.COMMIT_HASH}}
216220

217221

218222
# --------------------------------------------------
@@ -276,8 +280,10 @@ jobs:
276280
tags: |
277281
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended
278282
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended-${{env.COMMIT_HASH}}
283+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended
284+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended-${{env.COMMIT_HASH}}
279285
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended
280-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended
286+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-extended-${{env.COMMIT_HASH}}
281287

282288

283289
# --------------------------------------------------
@@ -340,5 +346,7 @@ jobs:
340346
tags: |
341347
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc
342348
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc-${{env.COMMIT_HASH}}
349+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc
350+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc-${{env.COMMIT_HASH}}
343351
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc
344-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc
352+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-nginx-alpine-wsc-${{env.COMMIT_HASH}}

‎.github/workflows/build_docker-debian_apache.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ jobs:
149149
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim
150150
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-slim-${{env.COMMIT_HASH}}
151151
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim-${{env.COMMIT_HASH}}
152+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim
153+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim-${{env.COMMIT_HASH}}
152154
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim
153-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim
155+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian-slim-${{env.COMMIT_HASH}}
154156

155157

156158
# --------------------------------------------------
@@ -215,8 +217,10 @@ jobs:
215217
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian
216218
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-${{env.COMMIT_HASH}}
217219
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian-${{env.COMMIT_HASH}}
220+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian
221+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-${{env.COMMIT_HASH}}
218222
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian
219-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian
223+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian-${{env.COMMIT_HASH}}
220224

221225

222226
# --------------------------------------------------
@@ -281,5 +285,7 @@ jobs:
281285
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc
282286
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-wsc-${{env.COMMIT_HASH}}
283287
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc-${{env.COMMIT_HASH}}
288+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc
289+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc-${{env.COMMIT_HASH}}
284290
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc
285-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc
291+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-apache-debian-wsc-${{env.COMMIT_HASH}}

‎.github/workflows/build_docker-debian_fpm.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ jobs:
148148
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
149149
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-slim-${{env.COMMIT_HASH}}
150150
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim-${{env.COMMIT_HASH}}
151+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
152+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim-${{env.COMMIT_HASH}}
151153
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
152-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim
154+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-slim-${{env.COMMIT_HASH}}
153155

154156

155157
# --------------------------------------------------
@@ -214,8 +216,10 @@ jobs:
214216
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian
215217
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-${{env.COMMIT_HASH}}
216218
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-${{env.COMMIT_HASH}}
219+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian
220+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-${{env.COMMIT_HASH}}
217221
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian
218-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian
222+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-${{env.COMMIT_HASH}}
219223

220224

221225
# --------------------------------------------------
@@ -280,5 +284,7 @@ jobs:
280284
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
281285
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-wsc-${{env.COMMIT_HASH}}
282286
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc-${{env.COMMIT_HASH}}
287+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
288+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc-${{env.COMMIT_HASH}}
289+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
283290
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc
284-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-fpm-debian-wsc

‎.github/workflows/build_docker-dhi_fpm.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ jobs:
146146
tags: |
147147
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc
148148
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
149+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc
150+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
149151
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc
150-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc
152+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
151153

152154

153155

@@ -221,5 +223,7 @@ jobs:
221223
tags: |
222224
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc
223225
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc-${{env.COMMIT_HASH}}
226+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc
227+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc-${{env.COMMIT_HASH}}
224228
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc
225-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc
229+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-dhi-fpm-debian-wsc-${{env.COMMIT_HASH}}

‎.github/workflows/build_docker-dhi_helper.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ jobs:
131131
tags: |
132132
docker.io/${{env.DOCKER_REPO}}:dhi-helper-alpine
133133
docker.io/${{env.DOCKER_REPO}}:dhi-helper-alpine-${{env.COMMIT_HASH}}
134+
quay.io/${{env.QUAY_REPO}}:dhi-helper-alpine
135+
quay.io/${{env.QUAY_REPO}}:dhi-helper-alpine-${{env.COMMIT_HASH}}
134136
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-alpine
135-
# quay.io/${{env.QUAY_REPO}}:dhi-helper-alpine
137+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-alpine-${{env.COMMIT_HASH}}
136138

137139

138140
# --------------------------------------------------
@@ -198,5 +200,7 @@ jobs:
198200
tags: |
199201
docker.io/${{env.DOCKER_REPO}}:dhi-helper-debian
200202
docker.io/${{env.DOCKER_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}
203+
quay.io/${{env.QUAY_REPO}}:dhi-helper-debian
204+
quay.io/${{env.QUAY_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}
201205
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-debian
202-
# quay.io/${{env.QUAY_REPO}}:dhi-helper-debian
206+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:dhi-helper-debian-${{env.COMMIT_HASH}}

‎.github/workflows/build_docker-doi_fpm.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ jobs:
146146
tags: |
147147
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc
148148
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
149+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc
150+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
149151
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc
150-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc
152+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-doi-fpm-alpine-wsc-${{env.COMMIT_HASH}}
151153

152154

153155

@@ -221,5 +223,7 @@ jobs:
221223
tags: |
222224
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc
223225
docker.io/${{env.DOCKER_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc-${{env.COMMIT_HASH}}
226+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc
227+
quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc-${{env.COMMIT_HASH}}
224228
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc
225-
# quay.io/${{env.QUAY_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc
229+
# ${{env.GIT_URL}}/${{env.GIT_REPO}}:${{env.PHP_VERSION}}-doi-fpm-debian-wsc-${{env.COMMIT_HASH}}

‎examples/fpm-nginx-aio/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ services:
148148
#
149149
# # https://github.com/hipages/php-fpm_exporter
150150
# wsc-php-fpm-exporter:
151-
# image: docker.io/hipages/php-fpm_exporter:latest # ghcr.io/hipages/php-fpm_exporter:latest
151+
# image: docker.io/hipages/php-fpm_exporter:latest # ghcr.io/hipages/php-fpm_exporter:latest # or: docker.io/tobi312/tools:php-fpm-exporter
152152
# container_name: wsc-php-fpm-exporter
153153
# restart: unless-stopped
154154
# command:

‎examples/fpm-nginx-dhi-k8s/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
11. Installation complete.
4646
12. Optional: example Backup-Script `kubectl apply -f wsc-backup-cronjob.yaml` (Please Test Backup and Recovery!)
4747

48+
If necessary, make further configurations for nginx (e.g. [rewrites](https://manual.woltlab.com/en/url-rewrites/#nginx)) or php in the files in the "config" folder.
49+
4850
## Registry Login
4951

5052
Login to docker.io and dhi.io Registries!

‎examples/fpm-nginx-dhi/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ If you don't want to use it, make adjustments in the NGINX configuration file in
8484
(Notice: Database Host is `wsc-db`!)
8585
11. Installation complete.
8686

87-
If necessary, make further configurations for nginx or php in the files in the "config" folder.
87+
If necessary, make further configurations for nginx (e.g. [rewrites](https://manual.woltlab.com/en/url-rewrites/#nginx)) or php in the files in the "config" folder.
8888

8989
> If you want to migrate from another PHP image, e.g. the official community image or other images in this repository, then adjust the folder and file permissions for the html folder:
9090
`chown 65532:65532 ./html`

0 commit comments

Comments
 (0)