Skip to content

Commit 23a3927

Browse files
committed
fix(gha): update docker bake step to use unmerged bake-files
1 parent 37098f9 commit 23a3927

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

.github/workflows/release.yaml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,31 +154,16 @@ jobs:
154154
type=ref,event=branch
155155
type=ref,event=pr
156156
type=sha
157-
- name: Merge Metadata Bake Definitions
158-
run: |
159-
INPUT=(${{ steps.meta-k3d-binary.outputs.bake-file }} ${{ steps.meta-k3d-dind.outputs.bake-file }} ${{ steps.meta-k3d-proxy.outputs.bake-file }} ${{ steps.meta-k3d-tools.outputs.bake-file }})
160-
OUT_FILE=$GITHUB_WORKSPACE/bake-metadata.json
161-
OUT_FILE_TMP=$GITHUB_WORKSPACE/bake-metadata-tmp.json
162-
163-
cat << EOF > $OUT_FILE
164-
{
165-
"target": {}
166-
}
167-
EOF
168-
169-
for file in "${INPUT[@]}"; do
170-
cat $OUT_FILE > $OUT_FILE_TMP
171-
jq -s '.[0] * .[1]' $OUT_FILE_TMP $file > $OUT_FILE
172-
done
173-
174-
rm "$OUT_FILE_TMP"
175157
# Build and Push container images
176158
- name: Build Images
177159
uses: docker/bake-action@v6
178160
with:
179161
files: |
180162
./docker-bake.hcl
181-
$GITHUB_WORKSPACE/bake-metadata.json
163+
${{ steps.meta-k3d-binary.outputs.bake-file }}
164+
${{ steps.meta-k3d-dind.outputs.bake-file }}
165+
${{ steps.meta-k3d-proxy.outputs.bake-file }}
166+
${{ steps.meta-k3d-tools.outputs.bake-file }}
182167
targets: release
183168
push: false
184169
# Wait for tests to pass and push images (ONLY ON TAG)

0 commit comments

Comments
 (0)