|
11 | 11 | ####### Uncomment this to test the CI pipeline in a PR
|
12 | 12 | ####### You'll also need to comment the rules containing {{branch}}
|
13 | 13 | ####### in the `Extract Docker metadata` step
|
14 |
| -# pull_request: |
15 |
| -# branches: [ "main" ] |
| 14 | + pull_request: |
| 15 | + branches: [ "main" ] |
16 | 16 |
|
17 | 17 | env:
|
18 | 18 | # Use docker.io for Docker Hub if empty
|
@@ -114,9 +114,12 @@ jobs:
|
114 | 114 | # Transform os/arch to os-arch for suffix target
|
115 | 115 | - name: Set ENV variables
|
116 | 116 | run: |
|
117 |
| - echo "IMAGE_NAME=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}" >> $GITHUB_ENV |
| 117 | + image_name=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/} |
| 118 | + echo "IMAGE_NAME=$image_name" >> $GITHUB_ENV |
118 | 119 | platform=${{ matrix.arch.platform }}
|
119 | 120 | echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
|
| 121 | + image_without_tag=${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/$image_name-${{ matrix.docker_target }} |
| 122 | + echo "FULL_IMAGE_WITHOUT_TAG=$(echo $image_without_tag | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV |
120 | 123 |
|
121 | 124 | - name: Checkout repository
|
122 | 125 | uses: actions/checkout@v4
|
@@ -168,7 +171,7 @@ jobs:
|
168 | 171 | target: ${{ matrix.docker_target }}
|
169 | 172 | platforms: ${{ matrix.arch.platform }}
|
170 | 173 | outputs: type=image,push-by-digest=true,name-canonical=true,push=true
|
171 |
| - tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.IMAGE_NAME }}-${{ matrix.docker_target }} |
| 174 | + tags: ${{ env.FULL_IMAGE_WITHOUT_TAG }} |
172 | 175 | labels: ${{ steps.meta.outputs.labels }}
|
173 | 176 | cache-from: type=registry,ref=${{ steps.meta-cache.outputs.tags }}
|
174 | 177 | cache-to: type=registry,ref=${{ steps.meta-cache.outputs.tags }},mode=max
|
@@ -211,7 +214,10 @@ jobs:
|
211 | 214 | # Set IMAGE_NAME so we can push to <owner>/<repo>/<image>
|
212 | 215 | - name: Set ENV variables
|
213 | 216 | run: |
|
214 |
| - echo "IMAGE_NAME=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}" >> $GITHUB_ENV |
| 217 | + image_name=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/} |
| 218 | + echo "IMAGE_NAME=$image_name" >> $GITHUB_ENV |
| 219 | + image_without_tag=${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/$image_name-${{ matrix.docker_target }} |
| 220 | + echo "FULL_IMAGE_WITHOUT_TAG=$(echo $image_without_tag | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV |
215 | 221 |
|
216 | 222 | - name: Download digests
|
217 | 223 | uses: actions/download-artifact@v4
|
@@ -257,11 +263,11 @@ jobs:
|
257 | 263 | working-directory: ${{ runner.temp }}/digests/${{ matrix.docker_target }}
|
258 | 264 | run: |
|
259 | 265 | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
260 |
| - $(printf '${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.IMAGE_NAME }}-${{ matrix.docker_target }}@sha256:%s ' *) |
| 266 | + $(printf '${{ env.FULL_IMAGE_WITHOUT_TAG }}@sha256:%s ' *) |
261 | 267 |
|
262 | 268 | - name: Inspect image
|
263 | 269 | run: |
|
264 |
| - docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.IMAGE_NAME }}-${{ matrix.docker_target }}:${{ steps.meta.outputs.version }} |
| 270 | + docker buildx imagetools inspect ${{ env.FULL_IMAGE_WITHOUT_TAG }}:${{ steps.meta.outputs.version }} |
265 | 271 |
|
266 | 272 | #TODO: Implement signature using generated key: https://docs.sigstore.dev/signing/quickstart/#signing-with-a-generated-key
|
267 | 273 |
|
|
0 commit comments