Skip to content

Commit 98b26c0

Browse files
committed
Cleanup overrides
1 parent 5925350 commit 98b26c0

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/integration-tests.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ jobs:
109109
set -x
110110
json="$(docker manifest inspect "${{ steps.build.outputs.image }}")"
111111
[[ "$(jq -r '.annotations."org.opencontainers.image.revision"' <<<"$json")" == "${{ matrix.test.commit-sha }}" ]] || exit 1
112+
- name: Validate docker/metadata-output environment variables are overwritten
113+
shell: bash
114+
run: |
115+
if [[ "$(printenv | grep '^DOCKER_METADATA_OUTPUT_' | grep '[^=]$' | wc -l)" -ne 0 ]]; then
116+
printenv | grep '^DOCKER_METADATA_OUTPUT_'
117+
exit 1
118+
fi
112119
113120
cleanup:
114121
name: Cleanup

action.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ runs:
6767
branch: ${{ github.head_ref || (github.ref_type == 'branch' && github.ref_name) }}
6868
- name: Docker metadata
6969
id: metadata
70-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
70+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
7171
with:
7272
images: |
7373
${{ inputs.image-repository }}
@@ -80,7 +80,7 @@ runs:
8080
- name: Docker cache-from
8181
id: cache-from
8282
if: ${{ inputs.from-scratch != 'true' }}
83-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
83+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
8484
with:
8585
images: |
8686
${{ inputs.image-repository }}
@@ -90,7 +90,7 @@ runs:
9090
type=raw,prefix=cache-sha-,value=${{ github.event.pull_request.base.sha }},enable=${{ github.event_name == 'pull_request' }}
9191
- name: Docker cache-to
9292
id: cache-to
93-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
93+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
9494
with:
9595
images: |
9696
${{ inputs.image-repository }}
@@ -111,7 +111,6 @@ runs:
111111
echo "DOCKER_METADATA_OUTPUT_BAKE_FILE_TAGS=" >>"$GITHUB_ENV"
112112
echo "DOCKER_METADATA_OUTPUT_BAKE_FILE_LABELS=" >>"$GITHUB_ENV"
113113
echo "DOCKER_METADATA_OUTPUT_BAKE_FILE_ANNOTATIONS=" >>"$GITHUB_ENV"
114-
echo "DOCKER_METADATA_OUTPUT_BAKE_FILE=" >>"$GITHUB_ENV"
115114
- name: Docker cache metadata
116115
id: cache
117116
shell: bash

0 commit comments

Comments
 (0)