@@ -27,16 +27,17 @@ jobs:
27
27
uses : actions/checkout@v2
28
28
-
29
29
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
32
32
with :
33
33
images : |
34
34
${{ env.DOCKERHUB_SLUG }}
35
35
${{ 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 : |
40
41
org.opencontainers.image.title=Cloudflared
41
42
org.opencontainers.image.description=Cloudflared proxy-dns
42
43
org.opencontainers.image.vendor=CrazyMax
@@ -67,20 +68,20 @@ jobs:
67
68
with :
68
69
files : |
69
70
./docker-bake.hcl
70
- ${{ steps.docker_meta .outputs.bake-file }}
71
+ ${{ steps.meta .outputs.bake-file }}
71
72
targets : image-all
72
73
push : ${{ github.event_name != 'pull_request' }}
73
74
-
74
75
name : Check manifest
75
76
if : github.event_name != 'pull_request'
76
77
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 }}
79
80
-
80
81
name : Inspect image
81
82
if : github.event_name != 'pull_request'
82
83
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