Browse Source

update docker tag

New Future 5 months ago
parent
commit
1f269c67b4
2 changed files with 7 additions and 12 deletions
  1. 4 2
      .github/workflows/build.yml
  2. 3 10
      .github/workflows/publish.yml

+ 4 - 2
.github/workflows/build.yml

@@ -370,8 +370,10 @@ jobs:
         run: |
           set -ex
           docker buildx imagetools create \
-          --tag ${{ env.DOCKER_IMG }}:${{ github.ref_name }} \
-          --tag newfuture/ddns:${{ github.ref_name }} \
+          -t ${{ env.DOCKER_IMG }}:${{ github.ref_name }} \
+          -t newfuture/ddns:${{ github.ref_name }} \
+          ${{ github.ref_name=='master' && '-t $DOCKER_IMG:edge' }} \
+          ${{ github.ref_name=='master' && '-t newfuture/ddns:edge' }} \
           $(docker images --format "{{.Repository}}:{{.Tag}}" ${{ env.DOCKER_IMG }}:*) \
           --annotation "index,manifest:org.opencontainers.image.url=https://ddns.newfuture.cc" \
           --annotation "index,manifest:org.opencontainers.image.description=DDNS docker ${{ github.ref_name }} CI build (unstable version),集成测试(非稳定版)" \

+ 3 - 10
.github/workflows/publish.yml

@@ -45,9 +45,9 @@ jobs:
             newfuture/ddns
           flavor: | # exclude alpha, beta, rc
             latest=${{ !(contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'c')) }}
-          tags: | # edge for beta and rc
+          tags: | # next for beta and rc
             type=ref,event=tag
-            type=edge,enable=${{ contains(github.ref_name, 'b') || contains(github.ref_name, 'c')}} 
+            type=raw,value=next,enable=${{ contains(github.ref_name, 'b') || contains(github.ref_name, 'c')}} 
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
       - uses: docker/build-push-action@v6
@@ -60,14 +60,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
-          build-args: BUILDER=ghcr.io/newfuture/nuitka-builder:master
-      - name: Attest
-        uses: actions/attest-build-provenance@v2
-        id: attest
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true      
+          build-args: BUILDER=ghcr.io/newfuture/nuitka-builder:master   
 
   publish-pypi:
     runs-on: ubuntu-latest