Drop Ubuntu Disco

.gitlab-ci.yml

@@ -30,8 +30,5 @@ groovy:
 focal:
   <<: *build_job
 
-disco:
-  <<: *build_job
-
 bionic:
   <<: *build_job

Makefile

-TARGETS := bionic disco focal hirsute impish
+TARGETS := bionic focal hirsute impish
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 

disco/Makefile

-include ../dist.mk

disco/x86/Dockerfile

-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"]

disco/x86/Makefile

-include ../../image.mk

disco/x86_64/Dockerfile

-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"]

disco/x86_64/Makefile

-include ../../image.mk