From: Peter van Dijk Date: Mon, 31 Jan 2022 15:28:04 +0000 (+0100) Subject: builder: archs for oraclelinux-8; el-8 symlinks X-Git-Tag: auth-4.7.0-alpha1~36^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee53cf16161a6c45560475b647de420842532ef;p=thirdparty%2Fpdns.git builder: archs for oraclelinux-8; el-8 symlinks --- diff --git a/builder-support/dockerfiles/Dockerfile.target.el-8 b/builder-support/dockerfiles/Dockerfile.target.el-8 new file mode 120000 index 0000000000..608942e5e5 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.el-8 @@ -0,0 +1 @@ +Dockerfile.target.oraclelinux-8 \ 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 new file mode 120000 index 0000000000..f5f60eea19 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.el-8-amd64 @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..55a25a393c --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.el-8-arm64 @@ -0,0 +1 @@ +Dockerfile.target.oraclelinux-8-arm64 \ 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 d490101eb8..63dac11e52 100644 --- a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8 +++ b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8 @@ -3,7 +3,16 @@ # 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 && \ dnf install -y 'dnf-command(config-manager)' yum && \ diff --git a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64 new file mode 120000 index 0000000000..608942e5e5 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-amd64 @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..608942e5e5 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-8-arm64 @@ -0,0 +1 @@ +Dockerfile.target.oraclelinux-8 \ No newline at end of file