From: Andreas Schneider <asn@samba.org>
Date: Fri, 8 Aug 2025 07:57:59 +0000 (+0200)
Subject: bootstrap: Use slim images for Debian
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebb62bcbf4b2d65cd1f1b27d349a4f1bcee13ca0;p=thirdparty%2Fsamba.git

bootstrap: Use slim images for Debian

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Wed Sep 10 03:13:07 UTC 2025 on atb-devel-224
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 49e1e1792e8..b6ba6fab20f 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 3dc161f073e0f8ab1c8d5d59fef9e5e33630b51e
+  SAMBA_CI_CONTAINER_TAG: c881e62a14fbabdf014bb3653fffcff5a13e71cc
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
diff --git a/bootstrap/config.py b/bootstrap/config.py
index b4f8f62287e..3ef975c943f 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -453,7 +453,7 @@ end
 
 DEB_DISTS = {
     'debian11': {
-        'docker_image': 'debian:11',
+        'docker_image': 'debian:11-slim',
         'vagrant_box': 'debian/bullseye64',
         'replace': {
             'language-pack-en': '',   # included in locales
@@ -464,7 +464,7 @@ DEB_DISTS = {
         }
     },
     'debian11-32bit': {
-        'docker_image': 'debian:11',  # specify the platform in .gitlab-ci.yaml
+        'docker_image': 'debian:11-slim',  # specify the platform in .gitlab-ci.yaml
         'vagrant_box': 'debian/bullseye32',
         'replace': {
             'language-pack-en': '',   # included in locales
@@ -475,7 +475,7 @@ DEB_DISTS = {
         }
     },
     'debian12': {
-        'docker_image': 'debian:12',
+        'docker_image': 'debian:12-slim',
         'vagrant_box': 'debian/bookworm64',
         'replace': {
             'language-pack-en': '',   # included in locales
@@ -485,7 +485,7 @@ DEB_DISTS = {
         }
     },
     'debian12-32bit': {
-        'docker_image': 'registry-1.docker.io/i386/debian:12',
+        'docker_image': 'registry-1.docker.io/i386/debian:12-slim',
         'vagrant_box': 'debian/bookworm32',
         'replace': {
             'language-pack-en': '',   # included in locales
diff --git a/bootstrap/generated-dists/debian11-32bit/Dockerfile b/bootstrap/generated-dists/debian11-32bit/Dockerfile
index 90a961f5345..09123a1ef86 100644
--- a/bootstrap/generated-dists/debian11-32bit/Dockerfile
+++ b/bootstrap/generated-dists/debian11-32bit/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM debian:11
+FROM debian:11-slim
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/debian11/Dockerfile
index 90a961f5345..09123a1ef86 100644
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM debian:11
+FROM debian:11-slim
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian12-32bit/Dockerfile b/bootstrap/generated-dists/debian12-32bit/Dockerfile
index fc72e143624..7b6be71269f 100644
--- a/bootstrap/generated-dists/debian12-32bit/Dockerfile
+++ b/bootstrap/generated-dists/debian12-32bit/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM registry-1.docker.io/i386/debian:12
+FROM registry-1.docker.io/i386/debian:12-slim
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian12/Dockerfile b/bootstrap/generated-dists/debian12/Dockerfile
index 2b0e1401c73..1794e51d43d 100644
--- a/bootstrap/generated-dists/debian12/Dockerfile
+++ b/bootstrap/generated-dists/debian12/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM debian:12
+FROM debian:12-slim
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index f53be0c4935..eef678cad7c 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-0413fb9222b91edd0781452cb489b899bbe4b93a
+c881e62a14fbabdf014bb3653fffcff5a13e71cc