From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 1 Dec 2020 12:34:47 +0000 (+0100)
Subject: Drop non-LTS Ubuntu
X-Git-Tag: rec-4.5.0-alpha1~28^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=671bb64b3cd16d60c2b7b939d4d55396526d9474;p=thirdparty%2Fpdns.git

Drop non-LTS Ubuntu
---

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic
deleted file mode 100644
index 0c5d36ab16..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-cosmic
+++ /dev/null
@@ -1,27 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:cosmic as dist-base
-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-stretch/ pdns-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_recursor$M_all" ]
-ADD builder-support/debian/recursor/debian-stretch/ pdns-recursor-${BUILDER_VERSION}/debian/
-@ENDIF
-
-@IF [ -n "$M_dnsdist$M_all" ]
-ADD builder-support/debian/dnsdist/debian-stretch/ 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-disco b/builder-support/dockerfiles/Dockerfile.target.ubuntu-disco
deleted file mode 100644
index 764c10b23f..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-disco
+++ /dev/null
@@ -1,27 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:disco as dist-base
-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-eoan b/builder-support/dockerfiles/Dockerfile.target.ubuntu-eoan
deleted file mode 100644
index 860375e7d4..0000000000
--- a/builder-support/dockerfiles/Dockerfile.target.ubuntu-eoan
+++ /dev/null
@@ -1,27 +0,0 @@
-# First do the source builds
-@INCLUDE Dockerfile.target.sdist
-
-FROM ubuntu:eoan as dist-base
-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