From b36ad9cfefc508f0ac73aacf1004f131a6203285 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 25 Jun 2025 22:43:14 +0000 Subject: [PATCH] docker: use OCI media types for registry images. (fixes #79) Signed-off-by: Jason Volk --- docker/bake.hcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/bake.hcl b/docker/bake.hcl index 3e58f0db..d789a8ac 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -278,7 +278,7 @@ target "ghcr_io" { tags = [ "ghcr.io/${repo}:${git_ref_name}-${cargo_profile}-${feat_set}-${sys_target}", ] - output = ["type=registry,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] + output = ["type=registry,oci-mediatypes=true,compression=zstd,compression-level=${zstd_image_compress_level},force-compression=true,mode=min"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -290,7 +290,7 @@ target "docker_io" { tags = [ "docker.io/${docker_repo}:${git_ref_name}-${cargo_profile}-${feat_set}-${sys_target}", ] - output = ["type=registry,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] + output = ["type=registry,oci-mediatypes=true,compression=zstd,compression-level=${zstd_image_compress_level},force-compression=true,mode=min"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -555,7 +555,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=${zstd_image_compress_level}"] + output = ["type=oci,dest=tuwunel-oci.tar.zst,compression=zstd,compression-level=${zstd_image_compress_level},force-compression=true,mode=min"] matrix = cargo_rust_feat_sys inherits = [ elem("docker", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]), @@ -567,7 +567,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=zstd,mode=min,compression-level=${zstd_image_compress_level}"] + output = ["type=docker,compression=zstd,compression-level=${zstd_image_compress_level},force-compression=true,mode=min"] matrix = cargo_rust_feat_sys inherits = [ elem("static", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]),