diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 622eb069c5..355c797af7 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -18,7 +18,6 @@ env: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DIFY_WEB_IMAGE_NAME: ${{ vars.DIFY_WEB_IMAGE_NAME || 'langgenius/dify-web' }} DIFY_API_IMAGE_NAME: ${{ vars.DIFY_API_IMAGE_NAME || 'langgenius/dify-api' }} - DOCKER_TAG: "v0.8.3-fix1" jobs: build: @@ -67,7 +66,7 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env[matrix.image_name_env] }} - + - name: Build Docker image id: build uses: docker/build-push-action@v6 @@ -76,7 +75,7 @@ jobs: platforms: ${{ matrix.platform }} build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env[matrix.image_name_env] }}:${{ env.DOCKER_TAG }},push=true + outputs: type=image,name=${{ env[matrix.image_name_env] }},push-by-digest=true,name-canonical=true,push=true cache-from: type=gha,scope=${{ matrix.service_name }} cache-to: type=gha,mode=max,scope=${{ matrix.service_name }} @@ -127,14 +126,17 @@ jobs: with: images: ${{ env[matrix.image_name_env] }} tags: | - type=raw,value=${{ env.DOCKER_TAG }},enable=true + type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }} + type=ref,event=branch + type=sha,enable=true,priority=100,prefix=,suffix=,format=long + type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }} - name: Create manifest list and push working-directory: /tmp/digests run: | - docker buildx imagetools create \ - -t ${{ env[matrix.image_name_env] }}:${{ env.DOCKER_TAG }} - + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env[matrix.image_name_env] }}@sha256:%s ' *) + - name: Inspect image run: | - docker buildx imagetools inspect ${{ env[matrix.image_name_env] }}:${{ env.DOCKER_TAG }} + docker buildx imagetools inspect ${{ env[matrix.image_name_env] }}:${{ steps.meta.outputs.version }}