Migrate to debian:bookworm-slim

This aligns with the final image used by source controller.

Signed-off-by: Paulo Gomes <[email protected]>

Author: Paulo Gomes

.github/actions/run-tests/Dockerfile

@@ -3,7 +3,7 @@ ARG GO_VERSION=1.17
 ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
-ARG LIBGIT2_TAG=libgit2-1.1.1-1
+ARG LIBGIT2_TAG=libgit2-1.1.1-3
 
 FROM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2

Dockerfile

@@ -3,7 +3,7 @@ ARG GO_VERSION=1.17
 ARG XX_VERSION=1.1.0
 
 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2
-ARG LIBGIT2_TAG=libgit2-1.1.1-1
+ARG LIBGIT2_TAG=libgit2-1.1.1-3
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} as libgit2
@@ -14,7 +14,7 @@ FROM gostable AS go-linux
 
 FROM go-${TARGETOS} AS build-base-bullseye
 
-# Copy the build utiltiies
+# Copy the build utilities
 COPY --from=xx / /
 COPY --from=libgit2 /Makefile /libgit2/
 
@@ -30,7 +30,7 @@ FROM build-base-${BASE_VARIANT} as libgit2-bullseye
 ARG TARGETPLATFORM
 RUN FLAGS=$(xx-clang --print-cmake-defines) make -C /libgit2 libgit2
 
-FROM libgit2-${BASE_VARIANT} as build-bullseye
+FROM libgit2-${BASE_VARIANT} as build
 
 # Configure workspace
 WORKDIR /workspace
@@ -58,33 +58,31 @@ ARG TARGETPLATFORM
 RUN xx-go build -o image-automation-controller -trimpath \
     main.go
 
-FROM build-${BASE_VARIANT} as prepare-bullseye
+FROM build as prepare-bullseye
 
 # Move libgit2 lib to generic and predictable location
 ARG TARGETPLATFORM
 RUN mkdir -p /libgit2/lib/ \
     && cp -d /usr/lib/$(xx-info triple)/libgit2.so* /libgit2/lib/
 
-FROM prepare-${BASE_VARIANT} as build
+FROM prepare-${BASE_VARIANT} as prepare
 
-FROM debian:${BASE_VARIANT}-slim as controller
+# The target image must aligned with apt sources used for libgit2.
+FROM debian:bookworm-slim as controller
 
 # Copy libgit2
-COPY --from=build /libgit2/lib/ /usr/local/lib/
+COPY --from=prepare /libgit2/lib/ /usr/local/lib/
 RUN ldconfig
 
 # Upgrade packages and install runtime dependencies
-RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list \
-    && echo "deb-src http://deb.debian.org/debian sid main" >> /etc/apt/sources.list \
-    && apt update \
-    && apt install --no-install-recommends -y zlib1g/sid libssl1.1/sid libssh2-1/sid \
-    && apt install --no-install-recommends -y ca-certificates \
+RUN apt update \
+    && apt install -y zlib1g libssl1.1 libssh2-1 ca-certificates \
     && apt clean \
     && apt autoremove --purge -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy over binary from build
-COPY --from=build /workspace/image-automation-controller /usr/local/bin/
+COPY --from=prepare /workspace/image-automation-controller /usr/local/bin/
 
 USER 65534:65534
 

Makefile

@@ -8,7 +8,7 @@ CRD_OPTIONS ?= crd:crdVersions=v1
 
 # Base image used to build the Go binary
 LIBGIT2_IMG ?= ghcr.io/fluxcd/golang-with-libgit2
-LIBGIT2_TAG ?= libgit2-1.1.1-1
+LIBGIT2_TAG ?= libgit2-1.1.1-3
 
 # Allows for defining additional Docker buildx arguments,
 # e.g. '--push'.