From daebd29a249f2f7a2df8ea11909d824152ad4500 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 7 Mar 2023 17:56:55 +0100 Subject: [PATCH] add ubuntu:lunar builder target and test it daily --- .github/workflows/builder.yml | 1 + .../Dockerfile.target.ubuntu-lunar | 36 +++++++++++++++++++ .../Dockerfile.target.ubuntu-lunar-amd64 | 1 + .../Dockerfile.target.ubuntu-lunar-arm64 | 1 + 4 files changed, 39 insertions(+) create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar create mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 create mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 9af59b44c1..bead8101b4 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -24,6 +24,7 @@ jobs: - centos-8-stream - centos-9-stream - ubuntu-kinetic + - ubuntu-lunar - debian-bookworm fail-fast: false steps: diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar new file mode 100644 index 0000000000..ce71c39c03 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar @@ -0,0 +1,36 @@ +# 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 +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-lunar-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 new file mode 120000 index 0000000000..5ab4dd2441 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-amd64 @@ -0,0 +1 @@ +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 new file mode 120000 index 0000000000..5ab4dd2441 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-lunar-arm64 @@ -0,0 +1 @@ +Dockerfile.target.ubuntu-lunar \ No newline at end of file -- 2.47.2