From: Peter van Dijk Date: Tue, 26 Jan 2021 17:04:01 +0000 (+0100) Subject: builder: add arch-specific targets X-Git-Tag: dnsdist-1.6.0-alpha2~53^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5171a1ff33736815c57d1160ace3149ab97b99eb;p=thirdparty%2Fpdns.git builder: add arch-specific targets --- diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-7 b/builder-support/dockerfiles/Dockerfile.target.centos-7 index 91739f95ee..7e5032cd4b 100644 --- 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 index 0000000000..c6fc1ef94f --- /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 5b89e73e27..ee8cc74f37 100644 --- 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 index 0000000000..cfe890509a --- /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 index 0000000000..cfe890509a --- /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 66cc4ea6ea..6d0bba14e2 100644 --- 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 index 0000000000..47231fdc99 --- /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 index 0000000000..47231fdc99 --- /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 c7eb5f015b..fe38051fed 100644 --- 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 index 0000000000..003426b396 --- /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 index 0000000000..003426b396 --- /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 c1294bc2e7..956c449497 100644 --- 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 index 0000000000..d2a0521701 --- /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 index 0000000000..d2a0521701 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal-arm64 @@ -0,0 +1 @@ +Dockerfile.target.ubuntu-focal \ No newline at end of file