From 1ac498120e2af31f9b57072ffd6102f42154f4aa Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 14 Sep 2023 08:35:05 +0200 Subject: [PATCH] builder: drop ubuntu kinetic, it is EOL --- .github/workflows/builder.yml | 1 - .../Dockerfile.target.ubuntu-kinetic | 36 ------------------- .../Dockerfile.target.ubuntu-kinetic-amd64 | 1 - .../Dockerfile.target.ubuntu-kinetic-arm64 | 1 - 4 files changed, 39 deletions(-) delete mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic delete mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic-amd64 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic-arm64 diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index a81d0be783..09a98dc112 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -22,7 +22,6 @@ jobs: - el-8 - centos-8-stream - centos-9-stream - - ubuntu-kinetic - ubuntu-lunar - debian-bookworm - amazon-2023 diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic deleted file mode 100644 index 666501fdba..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic +++ /dev/null @@ -1,36 +0,0 @@ -# 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 deleted file mode 120000 index 7a8e3adf4e..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic-amd64 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 7a8e3adf4e..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-kinetic-arm64 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.ubuntu-kinetic \ No newline at end of file -- 2.47.2