lejianwen месяцев назад: 9
Родитель
Сommit
f8a6393ea9
2 измененных файлов с 12 добавлено и 12 удалено
  1. 6 6
      .github/workflows/build.yaml
  2. 6 6
      .github/workflows/ghcr.yml

+ 6 - 6
.github/workflows/build.yaml

@@ -310,8 +310,8 @@ jobs:
310
         uses: Noelware/docker-manifest-action@master
310
         uses: Noelware/docker-manifest-action@master
311
         if: github.event_name != 'workflow_dispatch'
311
         if: github.event_name != 'workflow_dispatch'
312
         with:
312
         with:
313
-          base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
314
-          extra-images: |
313
+          tags: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
314
+          inputs: |
315
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64,
315
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-amd64,
316
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8,
316
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-arm64v8,
317
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7,
317
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-armv7,
@@ -322,8 +322,8 @@ jobs:
322
       - name: Create and push manifest (:major)
322
       - name: Create and push manifest (:major)
323
         uses: Noelware/docker-manifest-action@master
323
         uses: Noelware/docker-manifest-action@master
324
         with:
324
         with:
325
-          base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
326
-          extra-images: |
325
+          tags: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
326
+          inputs: |
327
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64,
327
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-amd64,
328
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8,
328
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-arm64v8,
329
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7,
329
             ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}-armv7,
@@ -334,8 +334,8 @@ jobs:
334
       - name: Create and push manifest (:latest)
334
       - name: Create and push manifest (:latest)
335
         uses: Noelware/docker-manifest-action@master
335
         uses: Noelware/docker-manifest-action@master
336
         with:
336
         with:
337
-          base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}
338
-          extra-images: |
337
+          tags: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}
338
+          inputs: |
339
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64,
339
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-amd64,
340
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8,
340
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-arm64v8,
341
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7,
341
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-armv7,

+ 6 - 6
.github/workflows/ghcr.yml

@@ -171,8 +171,8 @@ jobs:
171
         uses: Noelware/docker-manifest-action@master
171
         uses: Noelware/docker-manifest-action@master
172
         if: github.event_name != 'workflow_dispatch'
172
         if: github.event_name != 'workflow_dispatch'
173
         with:
173
         with:
174
-          base-image: ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}
175
-          extra-images: |
174
+          tags: ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}
175
+          inputs: |
176
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-amd64,
176
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-amd64,
177
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-arm64v8,
177
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-arm64v8,
178
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-armv7,
178
             ghcr.io/${{ github.repository }}-s6:${{ env.GIT_TAG }}-armv7,
@@ -183,8 +183,8 @@ jobs:
183
       - name: Create and push manifest (:major)
183
       - name: Create and push manifest (:major)
184
         uses: Noelware/docker-manifest-action@master
184
         uses: Noelware/docker-manifest-action@master
185
         with:
185
         with:
186
-          base-image: ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}
187
-          extra-images: |
186
+          tags: ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}
187
+          inputs: |
188
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-amd64,
188
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-amd64,
189
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-arm64v8,
189
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-arm64v8,
190
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-armv7,
190
             ghcr.io/${{ github.repository }}-s6:${{ env.MAJOR_TAG }}-armv7,
@@ -195,8 +195,8 @@ jobs:
195
       - name: Create and push manifest (:latest)
195
       - name: Create and push manifest (:latest)
196
         uses: Noelware/docker-manifest-action@master
196
         uses: Noelware/docker-manifest-action@master
197
         with:
197
         with:
198
-          base-image: ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}
199
-          extra-images: |
198
+          tags: ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}
199
+          inputs: |
200
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-amd64,
200
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-amd64,
201
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-arm64v8,
201
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-arm64v8,
202
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-armv7,
202
             ghcr.io/${{ github.repository }}-s6:${{ env.LATEST_TAG }}-armv7,