builder: add arch-specific targets

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7
index 91739f95eedbc5357b02776700d67a35695f2763..7e5032cd4bb8b2835b97212318f222f22a87f557 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.centos-7
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-7
@@ -3,7 +3,13 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
+@IF [ ${BUILDER_TARGET} = centos-7 ]
 FROM centos:7 as dist-base
+@ENDIF
+@IF [ ${BUILDER_TARGET} = centos-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
 RUN touch /var/lib/rpm/* && yum install -y --nogpgcheck devtoolset-8-gcc-c++

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64 b/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64
new file mode 120000 (symlink)
index 0000000..c6fc1ef
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-7-amd64
@@ -0,0 +1 @@
+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 5b89e73e2759710455073f4f36552606aaa38f8f..ee8cc74f3751fb8bf3cbc96bd016e0366579edb1 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8
@@ -3,7 +3,15 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
+@IF [ ${BUILDER_TARGET} = centos-8 ]
 FROM centos:8 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=
 RUN touch /var/lib/rpm/* && yum install -y epel-release && \
     dnf install -y 'dnf-command(config-manager)' && \

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64
new file mode 120000 (symlink)
index 0000000..cfe8905
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64
@@ -0,0 +1 @@
+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
new file mode 120000 (symlink)
index 0000000..cfe8905
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64
@@ -0,0 +1 @@
+Dockerfile.target.centos-8
\ 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 66cc4ea6ea371067306359c2937785ec2f00533c..6d0bba14e278cb365496417384f4fec505b96d78 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.debian-buster
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-buster
@@ -1,7 +1,16 @@
 # 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
 RUN apt-get update && apt-get -y dist-upgrade

diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64
new file mode 120000 (symlink)
index 0000000..47231fd
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-buster-amd64
@@ -0,0 +1 @@
+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
new file mode 120000 (symlink)
index 0000000..47231fd
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.debian-buster-arm64
@@ -0,0 +1 @@
+Dockerfile.target.debian-buster
\ No newline at end of file

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
index c7eb5f015bd3487bf3d1aa1d934c639ae4aed755..fe38051feda3765b9e4ac6600ff67fd7e9b3202a 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
@@ -1,7 +1,15 @@
 # First do the source builds
 @INCLUDE Dockerfile.target.sdist
 
+@IF [ ${BUILDER_TARGET} = ubuntu-bionic ]
 FROM ubuntu:bionic as dist-base
+@ENDIF
+@IF [ ${BUILDER_TARGET} = ubuntu-bionic-amd64 ]
+FROM amd64/ubuntu:bionic as dist-base
+@ENDIF
+@IF [ ${BUILDER_TARGET} = ubuntu-bionic-arm64 ]
+FROM arm64v8/ubuntu:bionic 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-bionic-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
new file mode 120000 (symlink)
index 0000000..003426b
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
@@ -0,0 +1 @@
+Dockerfile.target.ubuntu-bionic
\ No newline at end of file

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64
new file mode 120000 (symlink)
index 0000000..003426b
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64
@@ -0,0 +1 @@
+Dockerfile.target.ubuntu-bionic
\ 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 c1294bc2e7e4c7c5761c0aa051bc902e60ff100a..956c4494971a525dfc7cde3d3f8dd608b893ce77 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
@@ -1,7 +1,15 @@
 # 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
new file mode 120000 (symlink)
index 0000000..d2a0521
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-amd64
@@ -0,0 +1 @@
+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
new file mode 120000 (symlink)
index 0000000..d2a0521
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-arm64
@@ -0,0 +1 @@
+Dockerfile.target.ubuntu-focal
\ No newline at end of file