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

diff --git a/BUILDING-PACKAGES.md b/BUILDING-PACKAGES.md
index 0df59bdd90c3405d3dfe54dccd824d6e093c6ad1..ca21587bc37271d7309652a3014da0113c3f155d 100644 (file)
--- 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 24a5dff8062e9905eb4aa10e77e46979212e455f..acf1e45b50e56c611a0d1754d69d082fba79327b 100644 (file)
--- 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 (symlink)
index c6fc1ef..0000000
--- 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 237ff5ad096ad90c323b2def60547fa3a1701c6a..b325cc0a1161d7d1128ace40cebdb760b09ae382 100644 (file)
--- 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 (symlink)
index cfe8905..0000000
--- 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 (symlink)
index cfe8905..0000000
--- 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 073bb7645f7281911a6a4fd5c10d331c109d8b9f..d134ec07398a59ff28d4d525f102ccd271ccb263 100644 (file)
--- 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 (symlink)
index 3e463e2..0000000
--- 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 (symlink)
index 3e463e2..0000000
--- 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 fb77dba9e044292aa1428e84bb92901d1d14c2cc..df239cfdd1b7c5589716caafb540cfdd2b687cbd 100644 (file)
--- 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 (symlink)
index f7f2fce..0000000
--- 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 (symlink)
index f7f2fce..0000000
--- 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 6d0bba14e278cb365496417384f4fec505b96d78..bff27c137d587ca9f65edb1dce809dd29c187171 100644 (file)
--- 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 (symlink)
index 47231fd..0000000
--- 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 (symlink)
index 47231fd..0000000
--- 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 8642f323b08ddce6e3b46422e748942170c16757..21759e0b618b7fd4e4575661123df9d24cfd208e 100644 (file)
--- 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 (symlink)
index fed04d5..0000000
--- 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 (symlink)
index fed04d5..0000000
--- 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 (symlink)
index 3369705..0000000
--- 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 (symlink)
index f5f60ee..0000000
--- 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 (symlink)
index 55a25a3..0000000
--- 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 5e35f9193c5decce4f6c06e7ece15ae019e25ebe..5aca4059a21b480aa30924de80a0a1fc8a4a0726 100644 (file)
--- 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 (symlink)
index 46968c4..0000000
--- 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 (symlink)
index 46968c4..0000000
--- 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 923759aa8a879e1091f2eaeb7e0ea3ca8b97d7df..f8e6e99b9e8243588e51d7ad26c3f9aa97f60156 100644 (file)
--- 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 (symlink)
index 608942e..0000000
--- 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 (symlink)
index 608942e..0000000
--- 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 956c4494971a525dfc7cde3d3f8dd608b893ce77..0431c3d1acf431847ec6135cedf88b4ba9acadd6 100644 (file)
--- 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 (symlink)
index d2a0521..0000000
--- 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 (symlink)
index d2a0521..0000000
--- 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 d623a956e2f66994439097bd7a841e6627358cd4..b9a9047d1d9d1b415198d4698f82b8b7e5685321 100644 (file)
--- 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 ce71c39c03afa09a7fb870da0c866e5cf18b6e3c..c3c3c4d8ec2e61591730a68523dc0dead4e46f66 100644 (file)
--- 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 (symlink)
index 5ab4dd2..0000000
--- 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 (symlink)
index 5ab4dd2..0000000
--- 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 a55089dfe9873748b3f74869f0fa846e2dd9d4ec..21639a4afddf1918e02ad0bafdb6e5e2b5aa4309 100644 (file)
--- 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 (symlink)
index 17efdef..0000000
--- 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 (symlink)
index 17efdef..0000000
--- 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 e25bddfb8551d904d1fe83e775020f3f1a8926df..5df880b950bebdb638b78fefb7ef551bbe179ffa 100644 (file)
--- 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 (symlink)
index c0c8713..0000000
--- 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 (symlink)
index c0c8713..0000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-noble-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-noble
\ No newline at end of file