diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml deleted file mode 100644 index 7e4a655..0000000 --- a/.github/workflows/docker-build.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Docker build - -on: - pull_request: - -jobs: - docker-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag iptv-proxy:ci-build --target executable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1515420..1d78359 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,8 @@ jobs: id-token: write packages: write attestations: write + outputs: + tag: ${{ needs.release-please.outputs.tag }} steps: - name: Prepare run: | @@ -52,9 +54,9 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=latest - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} + value=latest + type=semver,pattern={{version}},value=${{ needs.release-please.outputs.tag }} + type=semver,pattern={{major}}.{{minor}},value=${{ needs.release-please.outputs.tag }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -73,9 +75,12 @@ jobs: id: build uses: docker/build-push-action@v6 with: + provenance: false + push: true platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true + tags: ${{ steps.meta.outputs.tags }} + #outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 @@ -118,6 +123,10 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + value=latest + type=semver,pattern={{version}},value=${{ needs.build.outputs.tag }} + type=semver,pattern={{major}}.{{minor}},value=${{ needs.build.outputs.tag }} - name: Login to Docker Hub uses: docker/login-action@v3 @@ -134,4 +143,4 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}