From e552606434350f8980ec9d8110bd306e3dfa3c7a Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 30 Jan 2026 13:03:17 +0100
Subject: [PATCH 1/2] update to debian trixie for static builds

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 6bce9ccd..75e0eff3 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -181,7 +181,7 @@ target "_distro-static" {
     DISTRO_RELEASE = "static"
     DISTRO_ID = ""
     DISTRO_SUITE = ""
-    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "debian:bookworm"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "debian:trixie"
     TEST_ONLY = "0"
   }
 }

From 901154a6556a449763c6b475f60dcec6efcee8a3 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 30 Jan 2026 13:17:39 +0100
Subject: [PATCH 2/2] compose: update osxcross to 15.5

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 pkg/compose/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/compose/Dockerfile b/pkg/compose/Dockerfile
index 0e8db7dd..2bd9f9b7 100644
--- a/pkg/compose/Dockerfile
+++ b/pkg/compose/Dockerfile
@@ -40,7 +40,7 @@ FROM scratch AS scripts
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 
 # osxcross contains the MacOSX SDK for xx
-FROM dockercore/golang-cross:xx-sdk-extras AS osxsdk
+FROM crazymax/osxcross:15.5-alpine AS osxcross
 
 # go base image to retrieve /usr/local/go
 FROM ${GO_IMAGE}:${GO_VERSION}-${GO_IMAGE_VARIANT} AS go
@@ -217,7 +217,7 @@ RUN --mount=type=bind,source=scripts/pkg-static-build.sh,target=/usr/local/bin/p
     --mount=type=bind,from=scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \
     --mount=type=bind,from=src,source=/src,target=/usr/local/src/compose \
     --mount=type=bind,from=gocross,source=/usr/local/go,target=/usr/local/go,rw \
-    --mount=from=osxsdk,target=/xx-sdk,src=/xx-sdk \
+    --mount=type=bind,from=osxcross,src=/osxsdk,target=/xx-sdk \
     OUTDIR=/out BUILDDIR=/build SRCDIR=/usr/local/src/compose pkg-static-build
 
 FROM builder-static-$TARGETOS AS builder-static