diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3f6313b..c687d8e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,16 +58,17 @@ jobs: fetch-depth: 0 - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + id: meta + uses: crazy-max/ghaction-docker-meta@v2 with: images: | ${{ env.DOCKERHUB_SLUG }} ${{ env.GHCR_SLUG }} - tag-semver: | - {{version}} - tag-edge: true - label-custom: | + tags: | + type=semver,pattern={{version}} + type=ref,event=pr + type=edge + labels: | org.opencontainers.image.title=Diun org.opencontainers.image.description=Docker image update notifier org.opencontainers.image.vendor=CrazyMax @@ -114,7 +115,7 @@ jobs: with: files: | ./docker-bake.hcl - ${{ steps.docker_meta.outputs.bake-file }} + ${{ steps.meta.outputs.bake-file }} targets: image-all push: ${{ github.event_name != 'pull_request' }} - @@ -132,13 +133,13 @@ jobs: name: Check manifest if: github.event_name != 'pull_request' run: | - docker buildx imagetools inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }} - docker buildx imagetools inspect ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }} + docker buildx imagetools inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }} - name: Inspect image if: github.event_name != 'pull_request' run: | - docker pull ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }} - docker image inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }} - docker pull ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }} - docker image inspect ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }} + docker pull ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }} + docker image inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }} + docker pull ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }} + docker image inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index bc691500..edf238ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,10 +47,10 @@ ## 4.10.0 (2020/12/26) * Refactor CI and dev workflow with buildx bake (#247) - * Upload artifacts - * Add `image-local` target - * Single job for artifacts and image - * Add `armv5` artifact + * Upload artifacts + * Add `image-local` target + * Single job for artifacts and image + * Add `armv5` artifact * MQTT Reconnection Log Spam (#241) * Add Docker + File providers user guide (#239) * Bump github.com/alecthomas/kong from 0.2.11 to 0.2.12 (#231)