From 843ddf64030b314c105016a7ef6734211bcbb4c0 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@icinga.com> Date: Wed, 2 Dec 2020 12:48:51 +0100 Subject: [PATCH] Drop Ubuntu Trusty --- .gitlab-ci.yml | 3 --- Makefile | 2 +- trusty/Makefile | 1 - trusty/x86/Dockerfile | 35 ----------------------------------- trusty/x86/Makefile | 1 - trusty/x86_64/Dockerfile | 35 ----------------------------------- trusty/x86_64/Makefile | 1 - 7 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 trusty/Makefile delete mode 100644 trusty/x86/Dockerfile delete mode 100644 trusty/x86/Makefile delete mode 100644 trusty/x86_64/Dockerfile delete mode 100644 trusty/x86_64/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38ab0a5..753be9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,3 @@ bionic: xenial: <<: *build_job - -trusty: - <<: *build_job diff --git a/Makefile b/Makefile index 584b7cf..7e0ecd8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGETS := trusty xenial bionic disco focal hirsute +TARGETS := xenial bionic disco focal hirsute TARGETS_PUSH := $(TARGETS:=-push) TARGETS_CLEAN := $(TARGETS:=-clean) diff --git a/trusty/Makefile b/trusty/Makefile deleted file mode 100644 index 5575b72..0000000 --- a/trusty/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../dist.mk diff --git a/trusty/x86/Dockerfile b/trusty/x86/Dockerfile deleted file mode 100644 index d3241f1..0000000 --- a/trusty/x86/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM i386/ubuntu:trusty - -ENV DEBIAN_FRONTEND=noninteractive - -# This avoids long-running apt and dpkg commands -# apt seems to close all FDs with fcntl() until the open file limit... -RUN ( \ - echo '#!/bin/bash'; \ - echo 'ulimit -n 512'; \ - echo 'exec /usr/bin/apt-get "$@"'; \ - ) >/usr/local/sbin/apt-get \ - && chmod +x /usr/local/sbin/apt-get - -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=trusty \ - && 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/trusty/x86/Makefile b/trusty/x86/Makefile deleted file mode 100644 index 15497f2..0000000 --- a/trusty/x86/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../image.mk diff --git a/trusty/x86_64/Dockerfile b/trusty/x86_64/Dockerfile deleted file mode 100644 index d13e797..0000000 --- a/trusty/x86_64/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:trusty - -ENV DEBIAN_FRONTEND=noninteractive - -# This avoids long-running apt and dpkg commands -# apt seems to close all FDs with fcntl() until the open file limit... -RUN ( \ - echo '#!/bin/bash'; \ - echo 'ulimit -n 512'; \ - echo 'exec /usr/bin/apt-get "$@"'; \ - ) >/usr/local/sbin/apt-get \ - && chmod +x /usr/local/sbin/apt-get - -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=trusty \ - && 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/trusty/x86_64/Makefile b/trusty/x86_64/Makefile deleted file mode 100644 index 15497f2..0000000 --- a/trusty/x86_64/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../image.mk -- GitLab