|
|
@@ -216,7 +216,7 @@ jobs:
|
|
216
|
216
|
- { name: "amd64", docker_platform: "linux/amd64", s6_platform: "x86_64" }
|
|
217
|
217
|
- { name: "arm64v8", docker_platform: "linux/arm64", s6_platform: "aarch64" }
|
|
218
|
218
|
- { name: "armv7", docker_platform: "linux/arm/v7", s6_platform: "armhf" }
|
|
219
|
|
- - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" }
|
|
|
219
|
+# - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" }
|
|
220
|
220
|
|
|
221
|
221
|
steps:
|
|
222
|
222
|
|
|
|
@@ -305,7 +305,11 @@ jobs:
|
|
305
|
305
|
if: github.event_name != 'workflow_dispatch'
|
|
306
|
306
|
with:
|
|
307
|
307
|
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
|
|
308
|
|
- extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-i386
|
|
|
308
|
+ extra-images: |
|
|
|
309
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64,
|
|
|
310
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8,
|
|
|
311
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7,
|
|
|
312
|
+# ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-i386
|
|
309
|
313
|
push: true
|
|
310
|
314
|
|
|
311
|
315
|
# manifest for :1 tag (major release)
|
|
|
@@ -313,7 +317,11 @@ jobs:
|
|
313
|
317
|
uses: Noelware/docker-manifest-action@master
|
|
314
|
318
|
with:
|
|
315
|
319
|
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
|
|
316
|
|
- extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-i386
|
|
|
320
|
+ extra-images: |
|
|
|
321
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64,
|
|
|
322
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8,
|
|
|
323
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7,
|
|
|
324
|
+# ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-i386
|
|
317
|
325
|
push: true
|
|
318
|
326
|
|
|
319
|
327
|
# manifest for :latest tag
|
|
|
@@ -321,7 +329,11 @@ jobs:
|
|
321
|
329
|
uses: Noelware/docker-manifest-action@master
|
|
322
|
330
|
with:
|
|
323
|
331
|
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}
|
|
324
|
|
- extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-i386
|
|
|
332
|
+ extra-images: |
|
|
|
333
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64,
|
|
|
334
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8,
|
|
|
335
|
+ ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7,
|
|
|
336
|
+# ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-i386
|
|
325
|
337
|
push: true
|
|
326
|
338
|
|
|
327
|
339
|
|
|
|
@@ -399,7 +411,6 @@ jobs:
|
|
399
|
411
|
name: Docker manifest
|
|
400
|
412
|
needs: docker
|
|
401
|
413
|
runs-on: ubuntu-22.04
|
|
402
|
|
-
|
|
403
|
414
|
steps:
|
|
404
|
415
|
|
|
405
|
416
|
- name: Log in to Docker Hub
|