From 8a97b44d8a2be976f275c910d90e09bb58f722ee Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:46:43 +0200 Subject: [PATCH 1/3] adjusted makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 61d42b4ff96e..cdceaedefb1a 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ docker buildx bake --allow=fs.read=.. \ $(if $(findstring $(comma),$(DOCKER_TARGET_PLATFORMS)),,\ $(if $(local-dest),\ $(foreach service, $(SERVICES_NAMES_TO_BUILD),\ - --set $(service).output="type=docker$(comma)dest=$(local-dest)/$(service).tar") \ + --set $(service).output="type=docker$(comma)compression=zstd$(comma)compression-level=9$(comma)dest=$(local-dest)/$(service).tar") \ ,--load\ )\ )\ @@ -204,7 +204,7 @@ docker buildx bake --allow=fs.read=.. \ --set $(service).tags=$(DOCKER_REGISTRY)/$(service):$(DOCKER_IMAGE_TAG) \ ) \ $(foreach service, $(SERVICES_NAMES_TO_BUILD),\ - --set $(service).output="type=registry$(comma)push=true" \ + --set $(service).output="type=registry$(comma)compression=zstd$(comma)compression-level=9$(comma)push=true" \ )\ ,) \ $(if $(push),--push,) \ From a43239e5607e3682f6221afa1f63dfa01425b983 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Mon, 20 Oct 2025 17:57:22 +0200 Subject: [PATCH 2/3] small change --- services/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/services/docker-compose.yml b/services/docker-compose.yml index 8919cecf3e7c..e56f9f848f7c 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -7,7 +7,6 @@ x-dask-tls-secrets: &dask_tls_secrets # mode: 444 # not supported by docker stack compose as of 26.0.0 ## common environs - x-common-logging: &common_logging_environments LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED} LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING} From 23b9cf6ffcd6745d7df6a4f6f601bc3fbd75df28 Mon Sep 17 00:00:00 2001 From: sanderegg <35365065+sanderegg@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:00:23 +0200 Subject: [PATCH 3/3] needs oci type to have zstd. otherwise it needs direct push --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cdceaedefb1a..7d59295b0d0a 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,8 @@ docker buildx bake --allow=fs.read=.. \ $(if $(findstring $(comma),$(DOCKER_TARGET_PLATFORMS)),,\ $(if $(local-dest),\ $(foreach service, $(SERVICES_NAMES_TO_BUILD),\ - --set $(service).output="type=docker$(comma)compression=zstd$(comma)compression-level=9$(comma)dest=$(local-dest)/$(service).tar") \ + --set $(service).output="type=oci$(comma)\ + compression=zstd$(comma)compression-level=9$(comma)force-compression=true$(comma)dest=$(local-dest)/$(service)zstd.tar") \ ,--load\ )\ )\ @@ -204,7 +205,8 @@ docker buildx bake --allow=fs.read=.. \ --set $(service).tags=$(DOCKER_REGISTRY)/$(service):$(DOCKER_IMAGE_TAG) \ ) \ $(foreach service, $(SERVICES_NAMES_TO_BUILD),\ - --set $(service).output="type=registry$(comma)compression=zstd$(comma)compression-level=9$(comma)push=true" \ + --set $(service).output="type=registry$(comma)\ + compression=zstd$(comma)compression-level=1$(comma)force-compression=true$$(comma)push=true" \ )\ ,) \ $(if $(push),--push,) \