From b9511f163af4bb15e3b95a3bdde0858c6b9f2b89 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@icinga.com> Date: Wed, 2 Dec 2020 12:51:45 +0100 Subject: [PATCH] Drop CentOS 6 --- .gitlab-ci.yml | 6 ------ 6-i386/Dockerfile | 49 ----------------------------------------------- 6-i386/Makefile | 3 --- 6/Dockerfile | 45 ------------------------------------------- 6/Makefile | 2 -- Makefile | 4 ---- 6 files changed, 109 deletions(-) delete mode 100644 6-i386/Dockerfile delete mode 100644 6-i386/Makefile delete mode 100644 6/Dockerfile delete mode 100644 6/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00e228b..a751110 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,3 @@ before_script: '7': <<: *build_job - -'6': - <<: *build_job - -'6-i386': - <<: *build_job diff --git a/6-i386/Dockerfile b/6-i386/Dockerfile deleted file mode 100644 index 31aa59e..0000000 --- a/6-i386/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM i386/centos:6 - -# Force arch to allow crossbuilding on x86_64 host -RUN echo i686-redhat-linux-gnu >/etc/rpm/platform - -RUN yum update -y - -RUN yum install -y \ - sudo wget curl which tar expect git \ - patch rpm-build redhat-rpm-config rpmlint \ - patch make util-linux \ - yum-utils yum-plugin-ovl rpmdevtools createrepo \ - epel-release \ - && yum clean all - -RUN yum install -y \ - boost-devel \ - bison \ - cmake \ - openssl-devel \ - mysql-devel \ - yajl-devel \ - libedit-devel \ - ccache \ - gcc gcc-c++ \ - && yum clean all - -# not available on EL6 -#RUN yum install -y centos-release-scl centos-release-scl-rh - -RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \ - https://packages.icinga.com/epel/ICINGA-release.repo - -RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \ - && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils - -# TODO: Remove this once the build deps for boost have been cleaned up... -RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build - -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/6-i386/Makefile b/6-i386/Makefile deleted file mode 100644 index 4082e81..0000000 --- a/6-i386/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -VERSION := 6 -VARIANT := x86 -include ../image.mk diff --git a/6/Dockerfile b/6/Dockerfile deleted file mode 100644 index 656a245..0000000 --- a/6/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM centos:6 - -RUN yum update -y - -RUN yum install -y \ - sudo wget curl which tar expect git \ - patch rpm-build redhat-rpm-config rpmlint \ - patch make util-linux \ - yum-utils yum-plugin-ovl rpmdevtools createrepo \ - epel-release \ - && yum clean all - -RUN yum install -y \ - boost-devel \ - bison \ - cmake \ - openssl-devel \ - mysql-devel \ - yajl-devel \ - libedit-devel \ - ccache \ - gcc gcc-c++ \ - && yum clean all - -RUN yum install -y centos-release-scl centos-release-scl-rh - -RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \ - https://packages.icinga.com/epel/ICINGA-release.repo - -RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \ - && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils - -# TODO: Remove this once the build deps for boost have been cleaned up... -RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build - -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/6/Makefile b/6/Makefile deleted file mode 100644 index f451fe1..0000000 --- a/6/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index 2686b21..6b31ee2 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,7 @@ all: - $(MAKE) -C 6 - $(MAKE) -C 6-i386 $(MAKE) -C 7 $(MAKE) -C 8 push: - $(MAKE) -C 6-i386 push - $(MAKE) -C 6 push $(MAKE) -C 7 push $(MAKE) -C 8 push -- GitLab