From: romeroalx <alexis.romero@open-xchange.com>
Date: Thu, 23 May 2024 14:03:11 +0000 (+0200)
Subject: let docker decide the arch of images. remove amd64/arm64 symlinks
X-Git-Tag: rec-5.1.0-beta1~4^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff0110c6214cf9bdccdb8a5035d5622c7ae42693;p=thirdparty%2Fpdns.git

let docker decide the arch of images. remove amd64/arm64 symlinks
---

diff --git a/BUILDING-PACKAGES.md b/BUILDING-PACKAGES.md
index 0df59bdd90..ca21587bc3 100644
--- a/BUILDING-PACKAGES.md
+++ b/BUILDING-PACKAGES.md
@@ -51,12 +51,6 @@ cp builder-support/dockerfiles/Dockerfile.target.debian-buster builder-support/d
 
 In the new `builder-support/dockerfiles/Dockerfile.target.debian-bookworm` file, replace every occurence of `debian-buster` by `debian-bookworm`, and of `debian:buster` by `debian:bookworm`
 
-Create symbolic links for the amd64 and arm64 versions:
-```
-ln -s builder-support/dockerfiles/Dockerfile.target.debian-bookworm builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64
-ln -s builder-support/dockerfiles/Dockerfile.target.debian-bookworm builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64
-```
-
 Then add the new target to the list of OSes in the `.github/workflows/builder-dispatch.yml` workflow file:
 ```
 default: >-
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7
index 24a5dff806..acf1e45b50 100644
--- a/builder-support/dockerfiles/Dockerfile.target.centos-7
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-7
@@ -3,12 +3,7 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
-@IF [ ${BUILDER_TARGET} = centos-7 -o ${BUILDER_TARGET} = el-7 ]
 FROM centos:7 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = centos-7-amd64 -o ${BUILDER_TARGET} = el-7-amd64]
-FROM amd64/centos:7 as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 RUN touch /var/lib/rpm/* && yum install -y epel-release centos-release-scl-rh
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64 b/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64
deleted file mode 120000
index c6fc1ef94f..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.centos-7
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8 b/builder-support/dockerfiles/Dockerfile.target.centos-8
index 237ff5ad09..b325cc0a11 100644
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8
@@ -9,12 +9,6 @@ FROM centos:8 as dist-base
 @IF [ ${BUILDER_TARGET} = centos-8-stream ]
 FROM quay.io/centos/centos:stream8 as dist-base
 @ENDIF
-@IF [ ${BUILDER_TARGET} = centos-8-amd64 ]
-FROM amd64/centos:8 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = centos-8-arm64 ]
-FROM arm64v8/centos:8 as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64
deleted file mode 120000
index cfe890509a..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.centos-8
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64 b/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64
deleted file mode 120000
index cfe890509a..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.centos-8
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm
index 073bb7645f..d134ec0739 100644
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = debian-bookworm ]
 FROM debian:bookworm as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-bookworm-amd64 ]
-FROM amd64/debian:bookworm as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-bookworm-arm64 ]
-FROM arm64v8/debian:bookworm as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64
deleted file mode 120000
index 3e463e23ec..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-bookworm
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64
deleted file mode 120000
index 3e463e23ec..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-bookworm
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye b/builder-support/dockerfiles/Dockerfile.target.debian-bullseye
index fb77dba9e0..df239cfdd1 100644
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-bullseye
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = debian-bullseye ]
 FROM debian:bullseye as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-bullseye-amd64 ]
-FROM amd64/debian:bullseye as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-bullseye-arm64 ]
-FROM arm64v8/debian:bullseye as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-amd64
deleted file mode 120000
index f7f2fcea15..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-bullseye
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-arm64
deleted file mode 120000
index f7f2fcea15..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-bullseye-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-bullseye
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-buster b/builder-support/dockerfiles/Dockerfile.target.debian-buster
index 6d0bba14e2..bff27c137d 100644
--- a/builder-support/dockerfiles/Dockerfile.target.debian-buster
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-buster
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = debian-buster ]
 FROM debian:buster as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-buster-amd64 ]
-FROM amd64/debian:buster as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-buster-arm64 ]
-FROM arm64v8/debian:buster as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64
deleted file mode 120000
index 47231fdc99..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-buster
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-buster-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-buster-arm64
deleted file mode 120000
index 47231fdc99..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-buster-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-buster
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie b/builder-support/dockerfiles/Dockerfile.target.debian-trixie
index 8642f323b0..21759e0b61 100644
--- a/builder-support/dockerfiles/Dockerfile.target.debian-trixie
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-trixie
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = debian-trixie ]
 FROM debian:trixie as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-trixie-amd64 ]
-FROM amd64/debian:trixie as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = debian-trixie-arm64 ]
-FROM arm64v8/debian:trixie as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64
deleted file mode 120000
index fed04d5f74..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-trixie
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64
deleted file mode 120000
index fed04d5f74..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.debian-trixie
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-7-amd64 b/builder-support/dockerfiles/Dockerfile.target.el-7-amd64
deleted file mode 120000
index 3369705690..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.el-7-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.centos-7-amd64
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.el-8-amd64
deleted file mode 120000
index f5f60eea19..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.el-8-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.oraclelinux-8-amd64
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-8-arm64 b/builder-support/dockerfiles/Dockerfile.target.el-8-arm64
deleted file mode 120000
index 55a25a393c..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.el-8-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.oraclelinux-8-arm64
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9 b/builder-support/dockerfiles/Dockerfile.target.el-9
index 5e35f9193c..5aca4059a2 100644
--- a/builder-support/dockerfiles/Dockerfile.target.el-9
+++ b/builder-support/dockerfiles/Dockerfile.target.el-9
@@ -3,15 +3,7 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
-@IF [ ${BUILDER_TARGET} = oraclelinux-9 -o ${BUILDER_TARGET} = el-9 ]
 FROM oraclelinux:9 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = oraclelinux-9-amd64 -o ${BUILDER_TARGET} = el-9-amd64 ]
-FROM amd64/oraclelinux:9 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = oraclelinux-9-arm64 -o ${BUILDER_TARGET} = el-9-arm64 ]
-FROM arm64v8/oraclelinux:9 as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 RUN touch /var/lib/rpm/* && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9-amd64 b/builder-support/dockerfiles/Dockerfile.target.el-9-amd64
deleted file mode 120000
index 46968c4cc7..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.el-9-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.el-9
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9-arm64 b/builder-support/dockerfiles/Dockerfile.target.el-9-arm64
deleted file mode 120000
index 46968c4cc7..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.el-9-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.el-9
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8 b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8
index 923759aa8a..f8e6e99b9e 100644
--- a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8
+++ b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8
@@ -3,15 +3,7 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
-@IF [ ${BUILDER_TARGET} = oraclelinux-8 -o ${BUILDER_TARGET} = el-8 ]
 FROM oraclelinux:8 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = oraclelinux-8-amd64 -o ${BUILDER_TARGET} = el-8-amd64 ]
-FROM amd64/oraclelinux:8 as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = oraclelinux-8-arm64 -o ${BUILDER_TARGET} = el-8-arm64 ]
-FROM arm64v8/oraclelinux:8 as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 RUN touch /var/lib/rpm/* && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
diff --git a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64
deleted file mode 120000
index 608942e5e5..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.oraclelinux-8
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-arm64 b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-arm64
deleted file mode 120000
index 608942e5e5..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.oraclelinux-8
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
index 956c449497..0431c3d1ac 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
@@ -1,15 +1,8 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = ubuntu-focal ]
 FROM ubuntu:focal as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-focal-amd64 ]
-FROM amd64/ubuntu:focal as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-focal-arm64 ]
-FROM arm64v8/ubuntu:focal as dist-base
-@ENDIF
+
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-amd64
deleted file mode 120000
index d2a0521701..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-focal
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-arm64
deleted file mode 120000
index d2a0521701..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-focal
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy b/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy
index d623a956e2..b9a9047d1d 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy
@@ -1,15 +1,8 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = ubuntu-jammy ]
 FROM ubuntu:jammy as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-jammy-amd64 ]
-FROM amd64/ubuntu:jammy as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-jammy-arm64 ]
-FROM arm64v8/ubuntu:jammy as dist-base
-@ENDIF
+
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
 RUN apt-get update && apt-get -y dist-upgrade
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar
index ce71c39c03..c3c3c4d8ec 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = ubuntu-lunar ]
 FROM ubuntu:lunar as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-lunar-amd64 ]
-FROM amd64/ubuntu:lunar as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-lunar-arm64 ]
-FROM arm64v8/ubuntu:lunar as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64
deleted file mode 120000
index 5ab4dd2441..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-lunar
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64
deleted file mode 120000
index 5ab4dd2441..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-lunar
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic
index a55089dfe9..21639a4afd 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = ubuntu-mantic ]
 FROM ubuntu:mantic as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-mantic-amd64 ]
-FROM amd64/ubuntu:mantic as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-mantic-arm64 ]
-FROM arm64v8/ubuntu:mantic as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64
deleted file mode 120000
index 17efdefeb1..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-mantic
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-arm64
deleted file mode 120000
index 17efdefeb1..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-mantic
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble b/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble
index e25bddfb85..5df880b950 100644
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble
@@ -1,15 +1,7 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
-@IF [ ${BUILDER_TARGET} = ubuntu-noble ]
 FROM ubuntu:noble as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-noble-amd64 ]
-FROM amd64/ubuntu:noble as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-noble-arm64 ]
-FROM arm64v8/ubuntu:noble as dist-base
-@ENDIF
 
 ARG BUILDER_CACHE_BUSTER=
 ARG APT_URL
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-amd64
deleted file mode 120000
index c0c8713948..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-noble
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-arm64
deleted file mode 120000
index c0c8713948..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-noble
\ No newline at end of file