diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml index 371e0467..a0af1c98 100644 --- a/.github/workflows/dev-latest.yml +++ b/.github/workflows/dev-latest.yml @@ -44,6 +44,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Docker metadata + id: meta + uses: docker/metadata-action@v4 + with: + images: | + estrellaxd/auto_bangumi + ghcr.io/${{ github.repository }} + tags: | + type=semver,pattern={{version}} + type=raw,value=dev-latest + - name: Login to Docker Hub uses: docker/login-action@v2 with: @@ -62,11 +73,7 @@ jobs: with: context: . push: true - tags: | - estrellaxd/auto_bangumi:dev-latest - estrellaxd/auto_bangumi:${{ github.ref_name }} - ghcr.io/estrellaxd/auto_bangumi:dev-latest - ghcr.io/estrellaxd/auto_bangumi:${{ github.ref_name }} + tags: ${{ steps.meta.outputs.tags }} file: Dockerfile generate_release: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9ad272b8..a3f9c936 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,6 +51,7 @@ jobs: with: images: | estrellaxd/auto_bangumi + ghcr.io/${{ github.repository }} tags: | type=semver,pattern={{version}} type=raw,value=latest @@ -77,9 +78,7 @@ jobs: builder: ${{ steps.buildx.output.name }} platforms: linux/amd64,linux/arm64 push: ${{ github.event_name == 'push' }} - tags: | - docker.io/${{ steps.meta.outputs.tags }} - ghcr.io/${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha, scope=${{ github.workflow }} cache-to: type=gha, scope=${{ github.workflow }}