diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 808d788..f261834 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -58,8 +58,8 @@ jobs: uses: actions/checkout@v2 - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + id: meta + uses: crazy-max/ghaction-docker-meta@v2 with: images: ${{ matrix.slug }} - @@ -84,21 +84,21 @@ jobs: file: ./test/Dockerfile-multi platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=${{ matrix.slug }}:master cache-to: type=inline - name: Inspect image if: github.event_name != 'pull_request' run: | - docker pull ${{ matrix.slug }}:${{ steps.docker_meta.outputs.version }} - docker image inspect ${{ matrix.slug }}:${{ steps.docker_meta.outputs.version }} + docker pull ${{ matrix.slug }}:${{ steps.meta.outputs.version }} + docker image inspect ${{ matrix.slug }}:${{ steps.meta.outputs.version }} - name: Check manifest if: github.event_name != 'pull_request' run: | - docker buildx imagetools inspect ${{ matrix.slug }}:${{ steps.docker_meta.outputs.version }} + docker buildx imagetools inspect ${{ matrix.slug }}:${{ steps.meta.outputs.version }} - name: Dump context if: always() diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 61fed23..b5c9302 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -28,11 +28,18 @@ jobs: uses: actions/checkout@v2 - 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.DOCKER_IMAGE }} # list of Docker images to use as base name for tags - tag-sha: true # add git short SHA as Docker tag + images: ${{ env.DOCKER_IMAGE }} + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -45,8 +52,8 @@ jobs: context: ./test file: ./test/Dockerfile load: true - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Build and push to local registry uses: ./ @@ -54,17 +61,17 @@ jobs: context: ./test file: ./test/Dockerfile push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Inspect image run: | - docker image inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} + docker image inspect ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.version }} - name: Check manifest if: github.event_name != 'pull_request' run: | - docker buildx imagetools inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} + docker buildx imagetools inspect ${{ env.DOCKER_IMAGE }}:${{ steps.meta.outputs.version }} - name: Dump context if: always() diff --git a/docs/advanced/tags-labels.md b/docs/advanced/tags-labels.md index 8a9e994..d6f17a7 100644 --- a/docs/advanced/tags-labels.md +++ b/docs/advanced/tags-labels.md @@ -29,15 +29,22 @@ jobs: uses: actions/checkout@v2 - name: Docker meta - id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + id: meta + uses: crazy-max/ghaction-docker-meta@v2 with: # list of Docker images to use as base name for tags images: | name/app ghcr.io/username/app - # add git short SHA as Docker tag - tag-sha: true + # generate Docker tags based on the following events/attributes + tags: | + type=schedule + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -65,6 +72,6 @@ jobs: with: context: . push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} ```