|
59 | 59 | description: "Cache layers to export if cache enabled (min or max)" |
60 | 60 | required: false |
61 | 61 | default: 'min' |
| 62 | + compression: |
| 63 | + type: string |
| 64 | + description: "Compression algorithm for image layers (one of uncompressed, gzip, estargz or zstd) (for image output)" |
| 65 | + required: false |
| 66 | + compression-level: |
| 67 | + type: string |
| 68 | + description: "Compression level for image layers (0-9 for gzip and estargz, 0-22 for zstd) (for image output)" |
| 69 | + required: false |
| 70 | + force-compression: |
| 71 | + type: boolean |
| 72 | + description: "Force re-compressing layers imported from a previous image if their compression type differs (for image output)" |
| 73 | + required: false |
| 74 | + default: false |
62 | 75 | context: |
63 | 76 | type: string |
64 | 77 | description: "Context to build from in the Git working tree" |
@@ -227,6 +240,7 @@ jobs: |
227 | 240 | ghaCacheSign: ${{ steps.set.outputs.ghaCacheSign }} |
228 | 241 | proxyNetwork: ${{ steps.set.outputs.proxyNetwork }} |
229 | 242 | registryLogin: ${{ steps.set.outputs.registryLogin }} |
| 243 | + compressionAttrs: ${{ steps.set.outputs.compressionAttrs }} |
230 | 244 | steps: |
231 | 245 | - |
232 | 246 | name: Install dependencies |
@@ -332,6 +346,9 @@ jobs: |
332 | 346 | INPUT_SIGN: ${{ inputs.sign }} |
333 | 347 | INPUT_TARGET: ${{ inputs.target }} |
334 | 348 | INPUT_VARS: ${{ inputs.vars }} |
| 349 | + INPUT_COMPRESSION: ${{ inputs.compression }} |
| 350 | + INPUT_COMPRESSION-LEVEL: ${{ inputs.compression-level }} |
| 351 | + INPUT_FORCE-COMPRESSION: ${{ inputs.force-compression }} |
335 | 352 | INPUT_GITHUB-TOKEN: ${{ secrets.github-token || github.token }} |
336 | 353 | INPUT_BUILDKIT-PROXY-NETWORK: ${{ inputs.buildkit-proxy-network }} |
337 | 354 | with: |
@@ -365,8 +382,11 @@ jobs: |
365 | 382 | const inpSign = core.getInput('sign'); |
366 | 383 | const inpTarget = core.getInput('target'); |
367 | 384 | const inpGitHubToken = core.getInput('github-token'); |
| 385 | + const inpCompression = core.getInput('compression'); |
| 386 | + const inpCompressionLevel = core.getInput('compression-level'); |
| 387 | + const inpForceCompression = core.getBooleanInput('force-compression'); |
368 | 388 | const inpProxyNetwork = core.getBooleanInput('buildkit-proxy-network'); |
369 | | - |
| 389 | +
|
370 | 390 | let runnerConfig; |
371 | 391 | try { |
372 | 392 | runnerConfig = RunnerMapping.parse(inpRunner); |
@@ -405,6 +425,28 @@ jobs: |
405 | 425 | } |
406 | 426 | const registryLogin = inpRegistryLogin === 'auto' ? inpOutput === 'image' && inpPush : inpRegistryLogin === 'true'; |
407 | 427 |
|
| 428 | + if (inpCompression && !['uncompressed', 'gzip', 'estargz', 'zstd'].includes(inpCompression)) { |
| 429 | + core.setFailed(`Invalid compression input: ${inpCompression}`); |
| 430 | + return; |
| 431 | + } |
| 432 | + if (inpCompressionLevel && !/^\d+$/.test(inpCompressionLevel)) { |
| 433 | + core.setFailed(`Invalid compression-level input: ${inpCompressionLevel}`); |
| 434 | + return; |
| 435 | + } |
| 436 | + const compressionAttrs = []; |
| 437 | + if (inpCompression) { |
| 438 | + compressionAttrs.push(`compression=${inpCompression}`); |
| 439 | + } |
| 440 | + if (inpCompressionLevel) { |
| 441 | + compressionAttrs.push(`compression-level=${inpCompressionLevel}`); |
| 442 | + } |
| 443 | + if (inpForceCompression) { |
| 444 | + compressionAttrs.push('force-compression=true'); |
| 445 | + } |
| 446 | + if (inpOutput === 'local' && compressionAttrs.length > 0) { |
| 447 | + core.warning(`compression inputs are ignored when output is local`); |
| 448 | + } |
| 449 | +
|
408 | 450 | const bakeVars = BakeVars.resolve(inpVars); |
409 | 451 | await core.group(`Set bake vars`, async () => { |
410 | 452 | core.info(JSON.stringify(bakeVars.map(value => { |
@@ -512,6 +554,10 @@ jobs: |
512 | 554 | core.info(`registryLogin: ${registryLogin}`); |
513 | 555 | core.setOutput('registryLogin', registryLogin); |
514 | 556 | }); |
| 557 | + await core.group(`Set compressionAttrs output`, async () => { |
| 558 | + core.info(`compressionAttrs: ${compressionAttrs.join(',')}`); |
| 559 | + core.setOutput('compressionAttrs', compressionAttrs.join(',')); |
| 560 | + }); |
515 | 561 |
|
516 | 562 | build: |
517 | 563 | runs-on: ${{ matrix.runner }} |
@@ -835,6 +881,7 @@ jobs: |
835 | 881 | INPUT_SET: ${{ inputs.set }} |
836 | 882 | INPUT_TARGET: ${{ inputs.target }} |
837 | 883 | INPUT_VARS: ${{ inputs.vars }} |
| 884 | + INPUT_COMPRESSION-ATTRS: ${{ needs.prepare.outputs.compressionAttrs }} |
838 | 885 | INPUT_META-IMAGES: ${{ needs.prepare.outputs.metaImages }} |
839 | 886 | INPUT_META-VERSION: ${{ steps.meta.outputs.version }} |
840 | 887 | INPUT_META-TAGS: ${{ steps.meta.outputs.tags }} |
@@ -874,6 +921,7 @@ jobs: |
874 | 921 | const inpTarget = core.getInput('target'); |
875 | 922 | const inpVars = Util.getInputList('vars', {ignoreComma: true, quote: false}); |
876 | 923 | const inpBuildkitProxyNetwork = core.getBooleanInput('buildkit-proxy-network'); |
| 924 | + const inpCompressionAttrs = core.getInput('compression-attrs'); |
877 | 925 |
|
878 | 926 | const inpMetaImages = core.getMultilineInput('meta-images'); |
879 | 927 | const inpMetaVersion = core.getInput('meta-version'); |
@@ -951,7 +999,7 @@ jobs: |
951 | 999 | core.setFailed('meta-images is required when output is image'); |
952 | 1000 | return; |
953 | 1001 | } |
954 | | - outputOverride = `*.output=type=image,"name=${inpMetaImages.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`; |
| 1002 | + outputOverride = `*.output=type=image,"name=${inpMetaImages.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}${inpCompressionAttrs ? `,${inpCompressionAttrs}` : ''}`; |
955 | 1003 | break; |
956 | 1004 | case 'local': |
957 | 1005 | outputOverride = `*.output=type=local,platform-split=true,dest=${inpLocalExportDir}`; |
|
0 commit comments