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