diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 753be9a6dd091351a9fb9de51763357f4c093a6d..7d028d8b01a0f817246c3c657f3cdd02233185f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,3 @@ disco: bionic: <<: *build_job - -xenial: - <<: *build_job diff --git a/Makefile b/Makefile index 7e0ecd8484f0070f819139567f027bb115c0d518..999a146d4f241f8c0186436b57625f9ab1a4f9cc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGETS := xenial bionic disco focal hirsute +TARGETS := bionic disco focal hirsute TARGETS_PUSH := $(TARGETS:=-push) TARGETS_CLEAN := $(TARGETS:=-clean) diff --git a/xenial/Makefile b/xenial/Makefile deleted file mode 100644 index 5575b7277a605ae7414bb26db324fb38dbb2f465..0000000000000000000000000000000000000000 --- a/xenial/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../dist.mk diff --git a/xenial/x86/Dockerfile b/xenial/x86/Dockerfile deleted file mode 100644 index 92a6c64c418bc033af8831d6b54647b98829aef9..0000000000000000000000000000000000000000 --- a/xenial/x86/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM i386/ubuntu:xenial - -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=$(awk -F= '/VERSION_CODENAME=/ {print $2}' /etc/os-release) \ - && 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/xenial/x86/Makefile b/xenial/x86/Makefile deleted file mode 100644 index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000 --- a/xenial/x86/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../image.mk diff --git a/xenial/x86_64/Dockerfile b/xenial/x86_64/Dockerfile deleted file mode 100644 index 40f738d4b7719aaae2aa69b74696e6aba8154949..0000000000000000000000000000000000000000 --- a/xenial/x86_64/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:xenial - -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=$(awk -F= '/VERSION_CODENAME=/ {print $2}' /etc/os-release) \ - && 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/xenial/x86_64/Makefile b/xenial/x86_64/Makefile deleted file mode 100644 index 15497f28d78567a8e18e399400d9e251ae31c60b..0000000000000000000000000000000000000000 --- a/xenial/x86_64/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../image.mk