Skip to content

Commit b403898

Browse files
committed
Meta action v2
1 parent e08f9d6 commit b403898

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/build.yml

+14-13
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ jobs:
2727
uses: actions/checkout@v2
2828
-
2929
name: Docker meta
30-
id: docker_meta
31-
uses: crazy-max/ghaction-docker-meta@v1
30+
id: meta
31+
uses: crazy-max/ghaction-docker-meta@v2
3232
with:
3333
images: |
3434
${{ env.DOCKERHUB_SLUG }}
3535
${{ env.GHCR_SLUG }}
36-
tag-edge: true
37-
tag-match: (.*)-r
38-
tag-match-group: 1
39-
label-custom: |
36+
tags: |
37+
type=match,pattern=(.*)-r,group=1
38+
type=ref,event=pr
39+
type=edge
40+
labels: |
4041
org.opencontainers.image.title=Cloudflared
4142
org.opencontainers.image.description=Cloudflared proxy-dns
4243
org.opencontainers.image.vendor=CrazyMax
@@ -67,20 +68,20 @@ jobs:
6768
with:
6869
files: |
6970
./docker-bake.hcl
70-
${{ steps.docker_meta.outputs.bake-file }}
71+
${{ steps.meta.outputs.bake-file }}
7172
targets: image-all
7273
push: ${{ github.event_name != 'pull_request' }}
7374
-
7475
name: Check manifest
7576
if: github.event_name != 'pull_request'
7677
run: |
77-
docker buildx imagetools inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }}
78-
docker buildx imagetools inspect ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }}
78+
docker buildx imagetools inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }}
79+
docker buildx imagetools inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}
7980
-
8081
name: Inspect image
8182
if: github.event_name != 'pull_request'
8283
run: |
83-
docker pull ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }}
84-
docker image inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.docker_meta.outputs.version }}
85-
docker pull ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }}
86-
docker image inspect ${{ env.GHCR_SLUG }}:${{ steps.docker_meta.outputs.version }}
84+
docker pull ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }}
85+
docker image inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }}
86+
docker pull ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}
87+
docker image inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}

0 commit comments

Comments
 (0)