From 17b4faeecdb345b104c641f56461ccc24364041a Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 24 Mar 2023 10:40:28 +0100
Subject: [PATCH] remove ubuntu bionic target, as 18.04 will EOL soon

---
 .github/workflows/builder-dispatch.yml        |  1 -
 .github/workflows/builder.yml                 |  1 -
 .../Dockerfile.target.ubuntu-bionic           | 35 -------------------
 .../Dockerfile.target.ubuntu-bionic-amd64     |  1 -
 .../Dockerfile.target.ubuntu-bionic-arm64     |  1 -
 5 files changed, 39 deletions(-)
 delete mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64

diff --git a/.github/workflows/builder-dispatch.yml b/.github/workflows/builder-dispatch.yml
index ca000c31fd..a8eb5e1968 100644
--- a/.github/workflows/builder-dispatch.yml
+++ b/.github/workflows/builder-dispatch.yml
@@ -20,7 +20,6 @@ on:
           el-9
           debian-buster
           debian-bullseye
-          ubuntu-bionic
           ubuntu-focal
           ubuntu-jammy
       ref:
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 8823b25c22..f0edb1afc0 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -19,7 +19,6 @@ jobs:
         product: ['authoritative', 'recursor', 'dnsdist']
         os:
           - centos-7
-          - ubuntu-bionic
           - el-8
           - centos-8-stream
           - centos-9-stream
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
deleted file mode 100644
index fe38051fed..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
+++ /dev/null
@@ -1,35 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-@IF [ ${BUILDER_TARGET} = ubuntu-bionic ]
-FROM ubuntu:bionic as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-bionic-amd64 ]
-FROM amd64/ubuntu:bionic as dist-base
-@ENDIF
-@IF [ ${BUILDER_TARGET} = ubuntu-bionic-arm64 ]
-FROM arm64v8/ubuntu:bionic 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-bionic-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
deleted file mode 120000
index 003426b396..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-bionic
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64
deleted file mode 120000
index 003426b396..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.target.ubuntu-bionic
\ No newline at end of file
-- 
2.47.2