From b36446f0f121bd00f8555c5c4e18aed935d3fb0f Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sat, 16 Jul 2022 22:38:56 +0200 Subject: [PATCH] add debian bookworm target and run it daily in CI --- .github/workflows/builder.yml | 2 +- .../Dockerfile.target.debian-bookworm | 36 +++++++++++++++++++ .../Dockerfile.target.debian-bookworm-amd64 | 1 + .../Dockerfile.target.debian-bookworm-arm64 | 1 + 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 builder-support/dockerfiles/Dockerfile.target.debian-bookworm create mode 120000 builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64 create mode 120000 builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64 diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index a5c80d9f18..f068496360 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -19,8 +19,8 @@ jobs: - el-8 - centos-8-stream - centos-9-stream - - debian-bullseye - ubuntu-kinetic + - debian-bookworm fail-fast: false steps: - uses: actions/checkout@v2.3.4 diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm new file mode 100644 index 0000000000..7f1b953daf --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm @@ -0,0 +1,36 @@ +# First do the source builds +@INCLUDE Dockerfile.target.sdist + +@IF [ ${BUILDER_TARGET} = debian-bookworm ] +FROM debian:bookworm as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = debian-bookworm-amd64 ] +FROM amd64/debian:bookworm as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = debian-bookworm-arm64 ] +FROM arm64v8/debian:bookworm 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.debian-bookworm-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64 new file mode 120000 index 0000000000..3e463e23ec --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64 @@ -0,0 +1 @@ +Dockerfile.target.debian-bookworm \ No newline at end of file diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64 new file mode 120000 index 0000000000..3e463e23ec --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64 @@ -0,0 +1 @@ +Dockerfile.target.debian-bookworm \ No newline at end of file -- 2.47.2