diff --git a/docker/bake.hcl b/docker/bake.hcl index e1634c94..1e0f6cc9 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -116,9 +116,12 @@ variable "package_last_modified" { } # Compression options -variable "image_compress_level" { +variable "zstd_image_compress_level" { default = 11 } +variable "gz_image_compress_level" { + default = 7 +} variable "cache_compress_level" { default = 7 } @@ -270,7 +273,7 @@ target "github" { docker_tag_preview? "ghcr.io/${repo}:preview": "", docker_tag_latest? "ghcr.io/${repo}:latest": "", ] - output = ["type=registry,compression=zstd,mode=min,compression-level=${image_compress_level}"] + output = ["type=registry,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -284,7 +287,7 @@ target "dockerhub" { docker_tag_preview? "${docker_repo}:preview": "", docker_tag_latest? "${docker_repo}:latest": "", ] - output = ["type=registry,compression=zstd,mode=min,compression-level=${image_compress_level}"] + output = ["type=registry,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -375,7 +378,7 @@ target "complement-tester" { elem_tag("complement-tester", [sys_name, sys_version, sys_target], "latest"), ] target = "complement-tester" - output = ["type=docker,compression=zstd,mode=min,compression-level=${image_compress_level}"] + output = ["type=docker,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] entitlements = ["network.host"] matrix = sys inherits = [ @@ -538,7 +541,7 @@ target "oci" { tags = [ elem_tag("oci", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"), ] - output = ["type=oci,dest=tuwunel-oci.tar.zst,mode=min,compression=zstd,compression-level=${image_compress_level}"] + output = ["type=oci,dest=tuwunel-oci.tar.zst,mode=min,compression=zstd,compression-level=${zstd_image_compress_level}"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -550,6 +553,7 @@ target "docker" { tags = [ elem_tag("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"), ] + output = ["type=docker,compression=gzip,mode=min,compression-level=${gz_image_compress_level}"] matrix = cargo_rust_feat_sys inherits = [ elem("static", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -565,9 +569,9 @@ target "docker" { elem("target:install", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]) ) } - target = "image" dockerfile-inline =<