Skip to content

Commit cfd8447

Browse files
crazy-maxcrazy-max
committed
digest output to return digest of image pushed or artifact uploaded
Signed-off-by: CrazyMax <[email protected]>
1 parent 5e149c0 commit cfd8447

2 files changed

Lines changed: 66 additions & 20 deletions

File tree

‎.github/workflows/bake.yml‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ on:
138138
artifact-name:
139139
description: "Name of the uploaded artifact (for local output)"
140140
value: ${{ jobs.finalize.outputs.artifact-name }}
141+
digest:
142+
description: "Digest of the image pushed or artifact uploaded"
143+
value: ${{ jobs.finalize.outputs.digest }}
141144
output-type:
142145
description: "Build output type"
143146
value: ${{ jobs.finalize.outputs.output-type }}
@@ -904,12 +907,21 @@ jobs:
904907
cosign-version: ${{ env.COSIGN_VERSION }}
905908
cosign-verify-commands: ${{ steps.set.outputs.cosign-verify-commands }}
906909
artifact-name: ${{ inputs.artifact-upload && inputs.artifact-name || '' }}
910+
digest: ${{ steps.manifest.outputs.digest || step.artifact.outputs.artifact-digest }}
907911
output-type: ${{ inputs.output }}
908912
signed: ${{ needs.prepare.outputs.sign }}
909913
needs:
910914
- prepare
911915
- build
912916
steps:
917+
-
918+
name: Install @docker/actions-toolkit
919+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
920+
env:
921+
INPUT_DAT-MODULE: ${{ env.DOCKER_ACTIONS_TOOLKIT_MODULE }}
922+
with:
923+
script: |
924+
await exec.exec('npm', ['install', '--prefer-offline', '--ignore-scripts', core.getInput('dat-module')]);
913925
-
914926
name: Docker meta
915927
id: meta
@@ -941,6 +953,7 @@ jobs:
941953
cache-binary: false
942954
-
943955
name: Create manifest
956+
id: manifest
944957
if: ${{ inputs.output == 'image' }}
945958
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
946959
env:
@@ -950,6 +963,8 @@ jobs:
950963
INPUT_BUILD-OUTPUTS: ${{ toJSON(needs.build.outputs) }}
951964
with:
952965
script: |
966+
const { ImageTools } = require('@docker/actions-toolkit/lib/buildx/imagetools');
967+
953968
const inpPush = core.getBooleanInput('push');
954969
const inpImageNames = core.getMultilineInput('image-names');
955970
const inpTagNames = core.getMultilineInput('tag-names');
@@ -967,24 +982,32 @@ jobs:
967982
return;
968983
}
969984
985+
let digest;
970986
for (const imageName of inpImageNames) {
971-
let createArgs = ['buildx', 'imagetools', 'create'];
987+
const tags = [];
972988
for (const tag of inpTagNames) {
973-
createArgs.push('-t', `${imageName}:${tag}`);
974-
}
975-
for (const digest of digests) {
976-
createArgs.push(digest);
989+
tags.push(`${imageName}:${tag}`);
977990
}
991+
const result = await new ImageTools().create({
992+
sources: digests,
993+
tags: tags,
994+
skipExec: !inpPush
995+
});
978996
if (inpPush) {
979-
await exec.exec('docker', createArgs);
980-
} else {
981-
await core.group(`Generated imagetools create command for ${imageName}`, async () => {
982-
core.info(`docker ${createArgs.join(' ')}`);
983-
});
997+
if (!result.digest) {
998+
core.setFailed('Failed to create manifest, no digest returned');
999+
return;
1000+
}
1001+
digest = result.digest;
1002+
core.info(`Manifest created: ${imageName}@${result.digest}`);
9841003
}
9851004
}
1005+
if (digest) {
1006+
core.setOutput('digest', digest);
1007+
}
9861008
-
9871009
name: Merge artifacts
1010+
id: artifact
9881011
if: ${{ inputs.output == 'local' && inputs.artifact-upload }}
9891012
uses: actions/upload-artifact/merge@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
9901013
with:

‎.github/workflows/build.yml‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ on:
141141
artifact-name:
142142
description: "Name of the uploaded artifact (for local output)"
143143
value: ${{ jobs.finalize.outputs.artifact-name }}
144+
digest:
145+
description: "Digest of the image pushed or artifact uploaded"
146+
value: ${{ jobs.finalize.outputs.digest }}
144147
output-type:
145148
description: "Build output type"
146149
value: ${{ jobs.finalize.outputs.output-type }}
@@ -758,12 +761,21 @@ jobs:
758761
cosign-version: ${{ env.COSIGN_VERSION }}
759762
cosign-verify-commands: ${{ steps.set.outputs.cosign-verify-commands }}
760763
artifact-name: ${{ inputs.artifact-upload && inputs.artifact-name || '' }}
764+
digest: ${{ steps.manifest.outputs.digest || step.artifact.outputs.artifact-digest }}
761765
output-type: ${{ inputs.output }}
762766
signed: ${{ needs.prepare.outputs.sign }}
763767
needs:
764768
- prepare
765769
- build
766770
steps:
771+
-
772+
name: Install @docker/actions-toolkit
773+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
774+
env:
775+
INPUT_DAT-MODULE: ${{ env.DOCKER_ACTIONS_TOOLKIT_MODULE }}
776+
with:
777+
script: |
778+
await exec.exec('npm', ['install', '--prefer-offline', '--ignore-scripts', core.getInput('dat-module')]);
767779
-
768780
name: Docker meta
769781
id: meta
@@ -794,6 +806,7 @@ jobs:
794806
cache-binary: false
795807
-
796808
name: Create manifest
809+
id: manifest
797810
if: ${{ inputs.output == 'image' }}
798811
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
799812
env:
@@ -803,6 +816,8 @@ jobs:
803816
INPUT_BUILD-OUTPUTS: ${{ toJSON(needs.build.outputs) }}
804817
with:
805818
script: |
819+
const { ImageTools } = require('@docker/actions-toolkit/lib/buildx/imagetools');
820+
806821
const inpPush = core.getBooleanInput('push');
807822
const inpImageNames = core.getMultilineInput('image-names');
808823
const inpTagNames = core.getMultilineInput('tag-names');
@@ -820,24 +835,32 @@ jobs:
820835
return;
821836
}
822837
838+
let digest;
823839
for (const imageName of inpImageNames) {
824-
let createArgs = ['buildx', 'imagetools', 'create'];
840+
const tags = [];
825841
for (const tag of inpTagNames) {
826-
createArgs.push('-t', `${imageName}:${tag}`);
827-
}
828-
for (const digest of digests) {
829-
createArgs.push(digest);
842+
tags.push(`${imageName}:${tag}`);
830843
}
844+
const result = await new ImageTools().create({
845+
sources: digests,
846+
tags: tags,
847+
skipExec: !inpPush
848+
});
831849
if (inpPush) {
832-
await exec.exec('docker', createArgs);
833-
} else {
834-
await core.group(`Generated imagetools create command for ${imageName}`, async () => {
835-
core.info(`docker ${createArgs.join(' ')}`);
836-
});
850+
if (!result.digest) {
851+
core.setFailed('Failed to create manifest, no digest returned');
852+
return;
853+
}
854+
digest = result.digest;
855+
core.info(`Manifest created: ${imageName}@${result.digest}`);
837856
}
838857
}
858+
if (digest) {
859+
core.setOutput('digest', digest);
860+
}
839861
-
840862
name: Merge artifacts
863+
id: artifact
841864
if: ${{ inputs.output == 'local' && inputs.artifact-upload }}
842865
uses: actions/upload-artifact/merge@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
843866
with:

0 commit comments

Comments
 (0)