From 4a90d5aa2aa398f6e796628c00a86fa9674b8a70 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 1 May 2020 21:50:45 +0200
Subject: [PATCH] Remove Ubuntu 18.10 "cosmic", as it reached EOL

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 README.md                    |  1 -
 deb/Makefile                 |  2 +-
 deb/ubuntu-cosmic/Dockerfile | 40 ------------------------------------
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 deb/ubuntu-cosmic/Dockerfile

diff --git a/README.md b/README.md
index 9d0429e31f..a4dcab7b28 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ The scripts will build for this list of packages types:
 * DEB packages for Ubuntu 20.04 Focal
 * DEB packages for Ubuntu 19.10 Eoan
 * DEB packages for Ubuntu 19.04 Disco
-* DEB packages for Ubuntu 18.10 Cosmic
 * DEB packages for Ubuntu 18.04 Bionic
 * DEB packages for Ubuntu 16.04 Xenial
 * DEB packages for Debian 10 Buster
diff --git a/deb/Makefile b/deb/Makefile
index 98962a756d..fa45fbf723 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -40,7 +40,7 @@ RUN?=docker run --rm \
 	debbuild-$@/$(ARCH)
 
 DEBIAN_VERSIONS := debian-stretch debian-buster
-UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan ubuntu-focal
+UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-disco ubuntu-eoan ubuntu-focal
 RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster
 DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
 
diff --git a/deb/ubuntu-cosmic/Dockerfile b/deb/ubuntu-cosmic/Dockerfile
deleted file mode 100644
index 73359b55da..0000000000
--- a/deb/ubuntu-cosmic/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-ARG GO_IMAGE
-ARG DISTRO=ubuntu
-ARG SUITE=cosmic
-ARG BUILD_IMAGE=${DISTRO}:${SUITE}
-
-FROM ${GO_IMAGE} AS golang
-
-FROM ${BUILD_IMAGE}
-
-# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639
-RUN if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \
-        rm -f /usr/bin/man; \
-        dpkg-divert --quiet --remove --rename /usr/bin/man; \
-    fi
-
-RUN apt-get update && apt-get install -y curl devscripts equivs git
-
-ENV GOPROXY=direct
-ENV GO111MODULE=off
-ENV GOPATH /go
-ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
-ENV DOCKER_BUILDTAGS apparmor seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
-
-ARG COMMON_FILES
-COPY ${COMMON_FILES} /root/build-deb/debian
-RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
-
-COPY sources/ /sources
-ARG DISTRO
-ARG SUITE
-ENV DISTRO=${DISTRO}
-ENV SUITE=${SUITE}
-
-COPY --from=golang /usr/local/go /usr/local/go
-
-WORKDIR /root/build-deb
-COPY build-deb /root/build-deb/build-deb
-
-ENTRYPOINT ["/root/build-deb/build-deb"]