Skip to content

Commit ca8600f

Browse files
authored
Merge pull request #2229 from OWASP/copilot/fix-2228
Fix Docker build pipeline matrix variable references in desktop-container-publish.yml
2 parents 6151d40 + d6ff164 commit ca8600f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/desktop-container-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
id: meta
8181
uses: docker/metadata-action@v5
8282
with:
83-
images: ghcr.io/${{ github.repository }}/${{ matrix.image_name }}
83+
images: ghcr.io/${{ github.repository }}/${{ matrix.container.image_name }}
8484
tags: |
8585
type=ref,event=branch
8686
type=raw,value=latest-master
@@ -96,22 +96,22 @@ jobs:
9696
with:
9797
platforms: linux/amd64,linux/arm64
9898
context: .
99-
file: ${{ matrix.dockerfile }}
99+
file: ${{ matrix.container.dockerfile }}
100100
push: true
101101
tags: ${{ steps.meta.outputs.tags }}
102102
labels: ${{ steps.meta.outputs.labels }}
103103
build-args: |
104104
argBasedVersion=${{ steps.extract-version.outputs.docker_version }}
105105
secrets: |
106106
mysecret=/tmp/mysecret.txt
107-
cache-from: type=gha,scope=${{ matrix.name }}
108-
cache-to: type=gha,mode=max,scope=${{ matrix.name }}
107+
cache-from: type=gha,scope=${{ matrix.container.name }}
108+
cache-to: type=gha,mode=max,scope=${{ matrix.container.name }}
109109

110110
- name: Verify Docker image was built
111111
run: |
112112
echo "Verifying Docker image was built successfully..."
113-
echo "Container: ${{ matrix.name }}"
114-
echo "Dockerfile: ${{ matrix.dockerfile }}"
113+
echo "Container: ${{ matrix.container.name }}"
114+
echo "Dockerfile: ${{ matrix.container.dockerfile }}"
115115
echo "Image tags: ${{ steps.meta.outputs.tags }}"
116116
echo "Image digest: ${{ steps.build.outputs.digest }}"
117117

0 commit comments

Comments
 (0)