Skip to content

Commit db07588

Browse files
committed
Fix glob for digest files
1 parent d897327 commit db07588

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/docker-build-simple.libsonnet

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ function(name, region='ap-northeast-1', platforms=['linux/arm64']) {
3737
},
3838
jobs: {
3939
build: {
40-
name: 'build',
4140
strategy: {
4241
matrix: {
4342
include: std.map(function(platform) {
@@ -47,6 +46,7 @@ function(name, region='ap-northeast-1', platforms=['linux/arm64']) {
4746
}, platforms),
4847
},
4948
},
49+
name: 'build (${{ matrix.platform }})',
5050
'runs-on': '${{ matrix.runner }}',
5151
permissions: { 'id-token': 'write', contents: 'read' },
5252
steps: setupSteps(region) + [
@@ -98,10 +98,11 @@ function(name, region='ap-northeast-1', platforms=['linux/arm64']) {
9898
{
9999
name: 'Push manifest',
100100
run: |||
101-
cat * | xargs -I{} printf "%s@%s" "${REPO}" {} | docker buildx imagetools create -f /dev/stdin -t "${REPO}:latest" -t "${REPO}:${SHA}"
101+
cat "${RUNNER_TEMP}"/digests/* | xargs -I{} printf "%s@%s" "${REPO}" {} | docker buildx imagetools create -f /dev/stdin -t "${REPO}:latest" -t "${REPO}:${SHA}"
102102
docker buildx imagetools inspect "${REPO}:${SHA}"
103103
|||,
104104
env: {
105+
RUNNER_TEMP: '${{ runner.temp }}',
105106
REPO: std.format('${{ steps.login-ecr.outputs.registry }}/%s', name),
106107
SHA: '${{ github.sha }}',
107108
},

.github/workflows/docker-unbound.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"jobs": {
33
"build": {
4-
"name": "build",
4+
"name": "build (${{ matrix.platform }})",
55
"permissions": {
66
"contents": "read",
77
"id-token": "write"
@@ -98,10 +98,11 @@
9898
{
9999
"env": {
100100
"REPO": "${{ steps.login-ecr.outputs.registry }}/unbound",
101+
"RUNNER_TEMP": "${{ runner.temp }}",
101102
"SHA": "${{ github.sha }}"
102103
},
103104
"name": "Push manifest",
104-
"run": "cat * | xargs -I{} printf \"%s@%s\" \"${REPO}\" {} | docker buildx imagetools create -f /dev/stdin -t \"${REPO}:latest\" -t \"${REPO}:${SHA}\"\ndocker buildx imagetools inspect \"${REPO}:${SHA}\"\n"
105+
"run": "cat \"${RUNNER_TEMP}\"/digests/* | xargs -I{} printf \"%s@%s\" \"${REPO}\" {} | docker buildx imagetools create -f /dev/stdin -t \"${REPO}:latest\" -t \"${REPO}:${SHA}\"\ndocker buildx imagetools inspect \"${REPO}:${SHA}\"\n"
105106
}
106107
]
107108
}

0 commit comments

Comments
 (0)