From: Andreas Schneider <asn@samba.org>
Date: Tue, 26 Nov 2024 18:38:40 +0000 (+0100)
Subject: gitlab-ci: Fix building debian 32bit images
X-Git-Tag: tdb-1.4.13~469
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a882e8610477b5c124bf4e3ec44fd7932a138ac7;p=thirdparty%2Fsamba.git

gitlab-ci: Fix building debian 32bit images

Trying to pull registry-1.docker.io/i386/debian:12...
Error: creating build container: choosing an image from manifest list
docker://registry-1.docker.io/i386/debian:12: no image found in image index for
architecture "amd64", variant "", OS "linux"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Nov 27 16:32:07 UTC 2024 on atb-devel-224
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index fca228d9af2..a4bfc48d6ba 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: b86ed4890ab0f95b15d3f3b11d1cd21327ac045f
+  SAMBA_CI_CONTAINER_TAG: d101907857587b6421907c45676497c336d45ea7
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 1d0ca0246da..0b37863d35a 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -10,6 +10,7 @@
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
     SAMBA_CI_TEST_JOB: "samba-o3"
+    SAMBA_CI_PLATFORM: "linux/amd64"
   before_script:
     # install prerequisites
     - dnf install -qy diffutils
@@ -27,7 +28,7 @@
   script: |
     set -xueo pipefail
     ci_image_name=samba-ci-${CI_JOB_NAME}
-    podman build -t ${ci_image_name} --build-arg SHA1SUM=${SAMBA_CI_CONTAINER_TAG} bootstrap/generated-dists/${CI_JOB_NAME}
+    podman build --platform ${SAMBA_CI_PLATFORM} --tag ${ci_image_name} --build-arg SHA1SUM=${SAMBA_CI_CONTAINER_TAG} bootstrap/generated-dists/${CI_JOB_NAME}
     ci_image_path="${SAMBA_CI_CONTAINER_REGISTRY}/${ci_image_name}"
     timestamp=$(date +%Y%m%d%H%M%S)
     container_hash=$(podman image inspect --format='{{ .Id }}' ${ci_image_name} | cut -c 1-9)
@@ -105,6 +106,7 @@ debian11-32bit:
   extends: .build_image_template
   variables:
     SAMBA_CI_TEST_JOB: "samba-32bit"
+    SAMBA_CI_PLATFORM: "linux/i386"
 
 rocky8:
   extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 465e9157169..e7c0a0deb51 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -461,7 +461,7 @@ DEB_DISTS = {
         }
     },
     'debian11-32bit': {
-        'docker_image': 'registry-1.docker.io/i386/debian:11',
+        'docker_image': 'debian:11',  # specify the platform in .gitlab-ci.yaml
         'vagrant_box': 'debian/bullseye32',
         'replace': {
             'language-pack-en': '',   # included in locales
diff --git a/bootstrap/generated-dists/debian11-32bit/Dockerfile b/bootstrap/generated-dists/debian11-32bit/Dockerfile
index d0133bd41c6..90a961f5345 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 registry-1.docker.io/i386/debian:11
+FROM debian:11
 
 # pass in with --build-arg while build
 ARG SHA1SUM
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 7c18889773a..401c5fda44b 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-b86ed4890ab0f95b15d3f3b11d1cd21327ac045f
+d101907857587b6421907c45676497c336d45ea7