From b42157951dfe7974dad561f0bc8da9c3194203be Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 14 Sep 2023 09:14:41 +0200 Subject: [PATCH] builder: add ubuntu-mantic target --- .github/workflows/builder.yml | 1 + .../Dockerfile.target.ubuntu-mantic | 36 +++++++++++++++++++ .../Dockerfile.target.ubuntu-mantic-amd64 | 1 + .../Dockerfile.target.ubuntu-mantic-arm64 | 1 + 4 files changed, 39 insertions(+) create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic create mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64 create mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-arm64 diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 09a98dc112..8c18ec5ba1 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -23,6 +23,7 @@ jobs: - centos-8-stream - centos-9-stream - ubuntu-lunar + - ubuntu-mantic - debian-bookworm - amazon-2023 fail-fast: false diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic new file mode 100644 index 0000000000..2dbc488e69 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic @@ -0,0 +1,36 @@ +# 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 +RUN apt-get update && apt-get -y dist-upgrade + +@INCLUDE Dockerfile.debbuild-prepare + +@IF [ -n "$M_authoritative$M_all" ] +ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/ +@ENDIF + +@IF [ -n "$M_recursor$M_all" ] +ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/ +@ENDIF + +@IF [ -n "$M_dnsdist$M_all" ] +ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/ +@ENDIF + +@INCLUDE Dockerfile.debbuild + +# Do a test install and verify +# Can be skipped with skiptests=1 in the environment +# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64 new file mode 120000 index 0000000000..17efdefeb1 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-amd64 @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..17efdefeb1 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-mantic-arm64 @@ -0,0 +1 @@ +Dockerfile.target.ubuntu-mantic \ No newline at end of file -- 2.47.2