feat: upgrade toolchain to v0.1.9

upgrades base image to ubuntu:noble

Signed-off-by: Artur Troian <[email protected]>

Author: troian

.env

@@ -1,5 +1,5 @@
 GO_VERSION=1.25.0
-TOOLCHAINS_VERSION=v0.1.8
+TOOLCHAINS_VERSION=v0.1.9
 GIT_CHGLOG_VERSION=v0.15.0
 GORELEASER_VERSION=2.11.2
 OSX_SDK=MacOSX12.0.sdk

Dockerfile.base

@@ -1,4 +1,4 @@
-ARG TOOLCHAINS_TAG=v0.1.8
+ARG TOOLCHAINS_TAG=v0.1.9
 
 FROM ghcr.io/goreleaser/goreleaser-cross-toolchains:${TOOLCHAINS_TAG}
 
@@ -12,21 +12,23 @@ ARG TARGETARCH
 ARG COSIGN_VERSION
 
 COPY entrypoint.sh /
+COPY docker.sources /
+
+# && sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
+# && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list \
+# && sed -ri "s/^deb /deb [arch=$TARGETARCH] /" /etc/apt/sources.list \
 
 # Install deps
 RUN \
     echo "Starting image build for Debian" \
- && sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
- && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list \
- && sed -ri "s/^deb /deb [arch=$TARGETARCH] /" /etc/apt/sources.list \
  && apt-get update \
  && apt-get install --no-install-recommends -y -q \
     software-properties-common \
     curl \
     gnupg2 \
     openssh-client \
- && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
- && echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list \
+ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+ && cp /docker.sources /etc/apt/sources.list.d/docker.sources \
  && apt-get update \
  && apt-get install --no-install-recommends -y -q \
         docker-ce \

Makefile

@@ -52,7 +52,7 @@ base-%:
 		--build-arg TINI_VERSION=$(TINI_VERSION) \
 		--build-arg COSIGN_VERSION=$(COSIGN_VERSION) \
 		--build-arg DEBIAN_FRONTEND=$(DEBIAN_FRONTEND) \
-		--build-arg TOOLCHAINS_TAG="$(TOOLCHAINS_VERSION)-$*" \
+		--build-arg TOOLCHAINS_TAG="$(TOOLCHAINS_VERSION)" \
 		. -f Dockerfile.base
 
 .PHONY: goreleaser-%

docker.sources

@@ -0,0 +1,6 @@
+Types: deb
+Architectures: arm64,amd64
+URIs: https://download.docker.com/linux/ubuntu
+Suites: noble
+Components: stable
+Signed-By: /etc/apt/keyrings/docker.gpg