From 5477dd5b6ec1a8b8e9bf95769b1fc9c0c9e1c50e Mon Sep 17 00:00:00 2001
From: Artem Sukhodolskyi <a.sukhodolskyi@scalr.com>
Date: Mon, 5 May 2025 14:47:41 +0200
Subject: [PATCH 1/2] SCALRCORE-34672 > Install GLIBC 2.41 for Checkov binaries

---
 Dockerfile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6542055..eb4a5dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,15 @@ SHELL ["/bin/bash", "-o", "pipefail", "-euxc"]
 
 # Base Software
 RUN <<EOT
+  # Install fresh glibc
+  echo "deb http://ftp.debian.org/debian sid main" >> /etc/apt/sources.list
+  apt-get update -y
+  apt-get -t sid install -y --no-install-recommends \
+    libc6=2.41-7 \
+    libc6-dev=2.41-7 \
+    libc6-dbg=2.41-7
+  sed -i '$ d' /etc/apt/sources.list
+  # Install base software
   apt-get update -y
   apt-get install -y --no-install-recommends \
     wget curl ca-certificates \
@@ -23,8 +32,8 @@ RUN <<EOT
   [ "${TARGETARCH}" = "amd64" ] && SESSION_MANAGER_ARCH="64bit" || SESSION_MANAGER_ARCH="arm64"
   curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_${SESSION_MANAGER_ARCH}/session-manager-plugin.deb" -o "session-manager-plugin.deb"
   dpkg -i session-manager-plugin.deb
-  rm session-manager-plugin.deb
   # Cleanup
+  rm session-manager-plugin.deb
   apt-get clean
   apt-get autoremove -y
   rm -rf /var/lib/apt/lists/*
@@ -105,4 +114,4 @@ RUN <<EOT
   rm -rf scalr_cli.zip
 EOT
 
-ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash"]

From 8438f9cc90c5ec1db2c2a52558211c7a9052e63e Mon Sep 17 00:00:00 2001
From: Artem Sukhodolskyi <a.sukhodolskyi@scalr.com>
Date: Tue, 6 May 2025 12:55:58 +0200
Subject: [PATCH 2/2] fix

---
 Dockerfile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index eb4a5dd..8288211 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 #
 # Note: This is a PUBLIC image, it should not contain any sensitive data.
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 ARG TARGETARCH
 
@@ -11,14 +11,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-euxc"]
 
 # Base Software
 RUN <<EOT
-  # Install fresh glibc
-  echo "deb http://ftp.debian.org/debian sid main" >> /etc/apt/sources.list
-  apt-get update -y
-  apt-get -t sid install -y --no-install-recommends \
-    libc6=2.41-7 \
-    libc6-dev=2.41-7 \
-    libc6-dbg=2.41-7
-  sed -i '$ d' /etc/apt/sources.list
   # Install base software
   apt-get update -y
   apt-get install -y --no-install-recommends \
@@ -83,7 +75,7 @@ EOT
 ARG AZURE_CLI_VERSION
 LABEL azure-cli.version=${AZURE_CLI_VERSION}
 RUN <<EOT
-  AZ_DIST=$(lsb_release -cs)
+  AZ_DIST=bookworm
   mkdir -p /etc/apt/keyrings
   curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null
   chmod go+r /etc/apt/keyrings/microsoft.gpg