From b79b80685fa96a86709a600f8d54c58874c17b25 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 2 Dec 2020 12:49:35 +0100
Subject: [PATCH] Drop Ubuntu Disco

---
 .gitlab-ci.yml          |  3 ---
 Makefile                |  2 +-
 disco/Makefile          |  1 -
 disco/x86/Dockerfile    | 26 --------------------------
 disco/x86/Makefile      |  1 -
 disco/x86_64/Dockerfile | 26 --------------------------
 disco/x86_64/Makefile   |  1 -
 7 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 disco/Makefile
 delete mode 100644 disco/x86/Dockerfile
 delete mode 100644 disco/x86/Makefile
 delete mode 100644 disco/x86_64/Dockerfile
 delete mode 100644 disco/x86_64/Makefile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f6e8fb..1463f25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,5 @@ groovy:
 focal:
   <<: *build_job
 
-disco:
-  <<: *build_job
-
 bionic:
   <<: *build_job
diff --git a/Makefile b/Makefile
index 4945eee..4654553 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := bionic disco focal hirsute impish
+TARGETS := bionic focal hirsute impish
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 
diff --git a/disco/Makefile b/disco/Makefile
deleted file mode 100644
index 5575b72..0000000
--- a/disco/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../dist.mk
diff --git a/disco/x86/Dockerfile b/disco/x86/Dockerfile
deleted file mode 100644
index 31b9465..0000000
--- a/disco/x86/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM i386/ubuntu:disco
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y eatmydata \
- && eatmydata apt-get upgrade -y
-
-RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
-  devscripts build-essential lintian ccache pbuilder aptitude apt-utils
-
-RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
- && DIST="$(lsb_release -sc)" \
- && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
-
-RUN groupadd -g 1000 build \
- && useradd -u 1000 -g 1000 -m build \
- && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
- && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
- && chown build.build /usr/local/bin
-
-USER build
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/disco/x86/Makefile b/disco/x86/Makefile
deleted file mode 100644
index 15497f2..0000000
--- a/disco/x86/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk
diff --git a/disco/x86_64/Dockerfile b/disco/x86_64/Dockerfile
deleted file mode 100644
index cb0e611..0000000
--- a/disco/x86_64/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:disco
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y eatmydata \
- && eatmydata apt-get upgrade -y
-
-RUN eatmydata apt-get install -y \
-  sudo wget curl tar expect git \
-  devscripts build-essential lintian ccache pbuilder aptitude apt-utils
-
-RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
- && DIST="$(lsb_release -sc)" \
- && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
-
-RUN groupadd -g 1000 build \
- && useradd -u 1000 -g 1000 -m build \
- && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
- && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
- && chown build.build /usr/local/bin
-
-USER build
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/disco/x86_64/Makefile b/disco/x86_64/Makefile
deleted file mode 100644
index 15497f2..0000000
--- a/disco/x86_64/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../image.mk
-- 
GitLab