5959 description : " Cache layers to export if cache enabled (min or max)"
6060 required : false
6161 default : ' min'
62+ compression :
63+ type : string
64+ description : " Image layer compression (uncompressed, gzip, estargz or zstd)"
65+ required : false
66+ compression-level :
67+ type : string
68+ description : " Image layer compression level (0-9 for gzip and estargz, 0-22 for zstd)"
69+ required : false
70+ force-compression :
71+ type : boolean
72+ description : " Recompress existing image layers using the selected compression type"
73+ required : false
74+ default : false
6275 context :
6376 type : string
6477 description : " Context to build from in the Git working tree"
@@ -219,6 +232,7 @@ jobs:
219232 include :
220233 - name : ${{ inputs.job-name-prefix }}
221234 outputs :
235+ buildOutput : ${{ steps.set.outputs.buildOutput }}
222236 includes : ${{ steps.set.outputs.includes }}
223237 metaImages : ${{ steps.set.outputs.metaImages }}
224238 sign : ${{ steps.set.outputs.sign }}
@@ -315,6 +329,10 @@ jobs:
315329 id : set
316330 uses : actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
317331 env :
332+ INPUT_LOCAL-EXPORT-DIR : ${{ env.LOCAL_EXPORT_DIR }}
333+ INPUT_COMPRESSION : ${{ inputs.compression }}
334+ INPUT_COMPRESSION-LEVEL : ${{ inputs.compression-level }}
335+ INPUT_FORCE-COMPRESSION : ${{ inputs.force-compression }}
318336 INPUT_SBOM-IMAGE : ${{ env.SBOM_IMAGE }}
319337 INPUT_MATRIX-SIZE-LIMIT : ${{ env.MATRIX_SIZE_LIMIT }}
320338 INPUT_META-IMAGES : ${{ inputs.meta-images }}
@@ -341,6 +359,7 @@ jobs:
341359 const { Build } = require('@docker/github-builder-runtime/lib/buildx/build');
342360 const { GitHub } = require('@docker/github-builder-runtime/lib/github/github');
343361 const { MetaImages } = require('@docker/github-builder-runtime/lib/github-builder/meta-images');
362+ const { BuildOutput } = require('@docker/github-builder-runtime/lib/github-builder/build-output');
344363 const { RunnerMapping } = require('@docker/github-builder-runtime/lib/github-builder/runner-mapping');
345364 const { BakeTargets } = require('@docker/github-builder-runtime/lib/github-builder/bake-targets');
346365 const { BakeVars } = require('@docker/github-builder-runtime/lib/github-builder/bake-vars');
@@ -364,6 +383,10 @@ jobs:
364383 const inpSbom = core.getBooleanInput('sbom');
365384 const inpSet = Util.getInputList('set', {ignoreComma: true, quote: false});
366385 const inpSign = core.getInput('sign');
386+ const inpCompression = core.getInput('compression');
387+ const inpCompressionLevel = core.getInput('compression-level');
388+ const inpForceCompression = core.getBooleanInput('force-compression');
389+ const inpLocalExportDir = core.getInput('local-export-dir');
367390 const inpTarget = core.getInput('target');
368391 const inpGitHubToken = core.getInput('github-token');
369392 const inpProxyNetwork = core.getBooleanInput('buildkit-proxy-network');
@@ -414,7 +437,26 @@ jobs:
414437 }).sort(), null, 2));
415438 });
416439
440+ if (inpCompressionLevel !== '' && (!/^\d+$/.test(inpCompressionLevel) || !Number.isSafeInteger(Number(inpCompressionLevel)))) {
441+ core.setFailed(`Invalid compression-level: ${inpCompressionLevel}`);
442+ return;
443+ }
444+
417445 const metaImages = MetaImages.resolve(inpMetaImages);
446+ const buildOutput = BuildOutput.resolve({
447+ output: inpOutput,
448+ images: metaImages,
449+ push: inpPush,
450+ localExportDir: inpLocalExportDir,
451+ compression: inpCompression || undefined,
452+ compressionLevel: inpCompressionLevel !== '' ? Number(inpCompressionLevel) : undefined,
453+ forceCompression: inpForceCompression || undefined
454+ });
455+ await core.group(`Set buildOutput output`, async () => {
456+ core.info(buildOutput);
457+ core.setOutput('buildOutput', buildOutput);
458+ });
459+
418460 await core.group(`Set metaImages output`, async () => {
419461 core.info(JSON.stringify(metaImages, null, 2));
420462 core.setOutput('metaImages', metaImages.join('\n'));
@@ -822,23 +864,20 @@ jobs:
822864 id : prepare
823865 uses : actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
824866 env :
867+ INPUT_BUILD-OUTPUT : ${{ needs.prepare.outputs.buildOutput }}
825868 INPUT_PLATFORM : ${{ matrix.platform }}
826869 INPUT_SBOM-IMAGE : ${{ env.SBOM_IMAGE }}
827- INPUT_LOCAL-EXPORT-DIR : ${{ env.LOCAL_EXPORT_DIR }}
828870 INPUT_CACHE : ${{ inputs.cache }}
829871 INPUT_CACHE-SCOPE : ${{ inputs.cache-scope }}
830872 INPUT_CACHE-MODE : ${{ inputs.cache-mode }}
831873 INPUT_BUILD-SECRETS : ${{ secrets.build-secrets }}
832874 INPUT_TARGETS : ${{ needs.prepare.outputs.targets }}
833875 INPUT_CONTEXT : ${{ inputs.context }}
834876 INPUT_FILES : ${{ inputs.files }}
835- INPUT_OUTPUT : ${{ inputs.output }}
836- INPUT_PUSH : ${{ inputs.push }}
837877 INPUT_SBOM : ${{ inputs.sbom }}
838878 INPUT_SET : ${{ inputs.set }}
839879 INPUT_TARGET : ${{ inputs.target }}
840880 INPUT_VARS : ${{ inputs.vars }}
841- INPUT_META-IMAGES : ${{ needs.prepare.outputs.metaImages }}
842881 INPUT_META-VERSION : ${{ steps.meta.outputs.version }}
843882 INPUT_META-TAGS : ${{ steps.meta.outputs.tags }}
844883 INPUT_SET-META-ANNOTATIONS : ${{ inputs.set-meta-annotations }}
@@ -861,7 +900,6 @@ jobs:
861900 core.setOutput('platform-pair-suffix', platformPairSuffix);
862901
863902 const inpSbomImage = core.getInput('sbom-image');
864- const inpLocalExportDir = core.getInput('local-export-dir');
865903
866904 const inpCache = core.getBooleanInput('cache');
867905 const inpCacheScope = core.getInput('cache-scope');
@@ -870,15 +908,12 @@ jobs:
870908 const inpTargets = core.getInput('targets');
871909 const inpContext = core.getInput('context');
872910 const inpFiles = Util.getInputList('files');
873- const inpOutput = core.getInput('output');
874- const inpPush = core.getBooleanInput('push');
875911 const inpSbom = core.getBooleanInput('sbom');
876912 const inpSet = Util.getInputList('set', {ignoreComma: true, quote: false});
877913 const inpTarget = core.getInput('target');
878914 const inpVars = Util.getInputList('vars', {ignoreComma: true, quote: false});
879915 const inpBuildkitProxyNetwork = core.getBooleanInput('buildkit-proxy-network');
880916
881- const inpMetaImages = core.getMultilineInput('meta-images');
882917 const inpMetaVersion = core.getInput('meta-version');
883918 const inpMetaTags = core.getMultilineInput('meta-tags');
884919 const inpSetMetaAnnotations = core.getBooleanInput('set-meta-annotations');
@@ -947,23 +982,6 @@ jobs:
947982 core.setOutput('files', bakeFiles.join(os.EOL));
948983 });
949984
950- let outputOverride = '';
951- switch (inpOutput) {
952- case 'image':
953- if (inpMetaImages.length == 0) {
954- core.setFailed('meta-images is required when output is image');
955- return;
956- }
957- outputOverride = `*.output=type=image,"name=${inpMetaImages.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`;
958- break;
959- case 'local':
960- outputOverride = `*.output=type=local,platform-split=true,dest=${inpLocalExportDir}`;
961- break;
962- default:
963- core.setFailed(`Invalid output: ${inpOutput}`);
964- return;
965- }
966-
967985 let bakeOverrides = [];
968986 try {
969987 bakeOverrides = inpSet.map(override => renderTemplate(override));
@@ -972,7 +990,7 @@ jobs:
972990 return;
973991 }
974992 await core.group(`Set bake overrides`, async () => {
975- bakeOverrides.push(outputOverride );
993+ bakeOverrides.push(`*.output=${core.getInput('build-output')}` );
976994 bakeOverrides.push('*.tags=');
977995 if (GitHub.context.payload.repository?.private ?? false) {
978996 // if this is a private repository, we set min provenance mode
0 commit comments