Skip to content

Commit 8c36fd4

Browse files
sinlovsinlov
committed
feat(ci): update Docker Buildx bake workflows
- Improve formatting and consistency in Docker Buildx bake workflows - Fix spacing issues in variable references - Update file paths to use consistent naming conventions - Improve readability of complex command lines
1 parent 6175a98 commit 8c36fd4

10 files changed

+148
-148
lines changed

‎.github/workflows-template/docker-buildx-bake/docker-buildx-bake-hubdocker-latest.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
name: Create matrix
7575
id: platforms
7676
run: |
77-
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}}".platforms')" >>${GITHUB_OUTPUT}
77+
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{ inputs.docker_bake_matrix_target_postfix }} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{ inputs.docker_bake_matrix_target_postfix }}".platforms')" >>${GITHUB_OUTPUT}
7878
-
7979
name: Show matrix
8080
run: |
@@ -165,7 +165,7 @@ jobs:
165165
with:
166166
files: |
167167
cwd://${{ inputs.docker_bake_config_file_path }}
168-
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
168+
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
169169
targets: ${{ inputs.docker_bake_targets }}
170170
no-cache: ${{ inputs.docker-build-no-cache }}
171171
provenance: false
@@ -239,14 +239,14 @@ jobs:
239239
# name: digests
240240
## https://github.com/actions/download-artifact/tree/v4?tab=readme-ov-file#breaking-changes
241241
pattern: digests-latest-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-*
242-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
242+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
243243
merge-multiple: true
244244

245245
-
246246
name: check temp config files
247247
run: |
248-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
249-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
248+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
249+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
250250
251251
-
252252
name: Set up Docker Buildx
@@ -268,5 +268,5 @@ jobs:
268268
-
269269
name: Inspect image
270270
run: |
271-
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json)
271+
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json)
272272
docker buildx imagetools inspect ${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}:${tag}

‎.github/workflows-template/docker-buildx-bake/docker-buildx-bake-hubdocker-tag.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
name: Create matrix
7474
id: platforms
7575
run: |
76-
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}}".platforms')" >>${GITHUB_OUTPUT}
76+
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{ inputs.docker_bake_matrix_target_postfix }} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{ inputs.docker_bake_matrix_target_postfix }}".platforms')" >>${GITHUB_OUTPUT}
7777
-
7878
name: Show matrix
7979
run: |
@@ -107,7 +107,7 @@ jobs:
107107
${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}
108108
tags: |
109109
# type semver https://github.com/docker/metadata-action#typesemver
110-
type=semver,pattern={{version}}
110+
type=semver,pattern={{ version }}
111111
flavor: |
112112
latest=auto
113113
suffix=${{ inputs.docker-metadata-flavor-suffix }}
@@ -124,7 +124,7 @@ jobs:
124124
if: ${{ inputs.push_remote_flag }}
125125
with:
126126
name: bake-tag-meta-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-${{ env.PLATFORM_PAIR }}
127-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
127+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
128128
overwrite: true
129129
if-no-files-found: error
130130
retention-days: 1
@@ -153,8 +153,8 @@ jobs:
153153
run: |
154154
echo "docker_bake_config_file_path: ${{ inputs.docker_bake_config_file_path }}"
155155
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
156-
echo "show: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json"
157-
cat ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
156+
echo "show: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json"
157+
cat ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
158158
159159
-
160160
name: Build
@@ -164,7 +164,7 @@ jobs:
164164
with:
165165
files: |
166166
cwd://${{ inputs.docker_bake_config_file_path }}
167-
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
167+
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
168168
targets: ${{ inputs.docker_bake_targets }}
169169
no-cache: ${{ inputs.docker-build-no-cache }}
170170
provenance: false
@@ -185,10 +185,10 @@ jobs:
185185
-
186186
name: Export digest
187187
run: |
188-
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests
188+
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests
189189
digest="${{ steps.bake-output-container-image-digest.outputs.digest }}"
190-
touch "${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/${digest#sha256:}"
191-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests
190+
touch "${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/${digest#sha256:}"
191+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests
192192
193193
-
194194
name: Upload digest
@@ -204,8 +204,8 @@ jobs:
204204
-
205205
name: check temp config files
206206
run: |
207-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
208-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
207+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
208+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
209209
210210
211211
merge:
@@ -218,8 +218,8 @@ jobs:
218218
-
219219
name: check temp path
220220
run: |
221-
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
222-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
221+
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
222+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
223223
224224
-
225225
name: Download meta bake definition
@@ -228,7 +228,7 @@ jobs:
228228
# name: bake-meta
229229
## https://github.com/actions/download-artifact/tree/v4?tab=readme-ov-file#breaking-changes
230230
pattern: bake-tag-meta-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-*
231-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
231+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
232232
merge-multiple: true
233233

234234
-
@@ -262,10 +262,10 @@ jobs:
262262
name: Create manifest list and push
263263
working-directory: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
264264
run: |
265-
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json) \
265+
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json) \
266266
$(printf '${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}@sha256:%s ' *)
267267
-
268268
name: Inspect image
269269
run: |
270-
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json)
270+
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json)
271271
docker buildx imagetools inspect ${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}:${tag}

‎.github/workflows-template/docker-buildx-bake/docker-buildx-bake-multi-latest.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
name: Create matrix
8080
id: platforms
8181
run: |
82-
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix}}".platforms')" >>${GITHUB_OUTPUT}
82+
echo "matrix=$(docker buildx bake ${{ inputs.docker_bake_targets }}${{inputs.docker_bake_matrix_target_postfix }} --print | jq -cr '.target."${{ inputs.docker_bake_targets }}${{ inputs.docker_bake_matrix_target_postfix }}".platforms')" >>${GITHUB_OUTPUT}
8383
-
8484
name: Show matrix
8585
run: |
@@ -122,16 +122,16 @@ jobs:
122122
-
123123
name: Rename meta bake definition file
124124
run: |
125-
mkdir -p "${{ runner.temp }}/${{ inputs.docker_bake_targets}}"
126-
mv "${{ steps.meta.outputs.bake-file }}" "${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json"
125+
mkdir -p "${{ runner.temp }}/${{ inputs.docker_bake_targets }}"
126+
mv "${{ steps.meta.outputs.bake-file }}" "${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json"
127127
128128
-
129129
name: Upload meta bake definition
130130
uses: actions/upload-artifact@v4
131131
if: ${{ inputs.push_remote_flag }}
132132
with:
133133
name: bake-latest-meta-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-${{ env.PLATFORM_PAIR }}
134-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
134+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
135135
overwrite: true
136136
if-no-files-found: error
137137
retention-days: 1
@@ -168,9 +168,9 @@ jobs:
168168
name: check build files
169169
run: |
170170
echo "docker_bake_config_file_path: ${{ inputs.docker_bake_config_file_path }}"
171-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
172-
echo "show: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json"
173-
cat ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
171+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
172+
echo "show: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json"
173+
cat ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
174174
175175
-
176176
name: Build
@@ -180,7 +180,7 @@ jobs:
180180
with:
181181
files: |
182182
cwd://${{ inputs.docker_bake_config_file_path }}
183-
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json
183+
cwd://${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json
184184
targets: ${{ inputs.docker_bake_targets }}
185185
no-cache: ${{ inputs.docker-build-no-cache }}
186186
provenance: false
@@ -196,32 +196,32 @@ jobs:
196196
- name: Extract container image digest from bake output
197197
id: bake-output-container-image-digest
198198
run: |
199-
echo "digest=$(echo '${{ steps.bake.outputs.metadata}}' | jq -cr '.["${{ inputs.docker_bake_targets }}"]["containerimage.digest"]')" >>$GITHUB_OUTPUT
199+
echo "digest=$(echo '${{ steps.bake.outputs.metadata }}' | jq -cr '.["${{ inputs.docker_bake_targets }}"]["containerimage.digest"]')" >>$GITHUB_OUTPUT
200200
201201
-
202202
name: Export digest
203203
run: |
204-
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests
204+
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests
205205
digest="${{ steps.bake-output-container-image-digest.outputs.digest }}"
206-
touch "${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/${digest#sha256:}"
207-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests
206+
touch "${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/${digest#sha256:}"
207+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests
208208
209209
-
210210
name: Upload digest
211211
uses: actions/upload-artifact@v4
212212
if: ${{ inputs.push_remote_flag }}
213213
with:
214214
name: digests-latest-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-${{ env.PLATFORM_PAIR }}
215-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/*
215+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/*
216216
overwrite: true
217217
if-no-files-found: error
218218
retention-days: 1
219219

220220
-
221221
name: check temp config files
222222
run: |
223-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
224-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
223+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
224+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
225225
226226
227227
merge:
@@ -234,8 +234,8 @@ jobs:
234234
-
235235
name: check temp path
236236
run: |
237-
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
238-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
237+
mkdir -p ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
238+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
239239
240240
-
241241
name: Download meta bake definition
@@ -254,14 +254,14 @@ jobs:
254254
# name: digests
255255
## https://github.com/actions/download-artifact/tree/v4?tab=readme-ov-file#breaking-changes
256256
pattern: digests-latest-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.docker_bake_targets }}-*
257-
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
257+
path: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
258258
merge-multiple: true
259259

260260
-
261261
name: check temp config files
262262
run: |
263-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}
264-
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
263+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}
264+
ls -al ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
265265
266266
-
267267
name: Set up Docker Buildx
@@ -284,15 +284,15 @@ jobs:
284284

285285
-
286286
name: Create manifest list and push
287-
working-directory: ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/digests/
287+
working-directory: ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/digests/
288288
run: |
289-
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json) \
289+
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json) \
290290
$(printf '${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}@sha256:%s ' *)
291-
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("ghcr.io/${{ inputs.ghcr_package_owner_name }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json) \
291+
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("ghcr.io/${{ inputs.ghcr_package_owner_name }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}")) | "-t " + .) | join(" ")' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json) \
292292
$(printf 'ghcr.io/${{ inputs.ghcr_package_owner_name }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}@sha256:%s ' *)
293293
-
294294
name: Inspect image
295295
run: |
296-
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets}}/bake-meta.json)
296+
tag=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' ${{ runner.temp }}/${{ inputs.docker_bake_targets }}/bake-meta.json)
297297
docker buildx imagetools inspect ${{ vars.ENV_DOCKERHUB_OWNER }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}:${tag}
298298
docker buildx imagetools inspect ghcr.io/${{ inputs.ghcr_package_owner_name }}/${{ vars.ENV_DOCKERHUB_REPO_NAME }}:${tag}

0 commit comments

Comments
 (0)