Merge branch 'feature/centos6' into 'master'

Drop CentOS 6

See merge request !1

.gitlab-ci.yml

@@ -23,9 +23,3 @@ before_script:
 
 '7':
   <<: *build_job
-
-'6':
-  <<: *build_job
-
-'6-i386':
-  <<: *build_job

6-i386/Dockerfile

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

6-i386/Makefile

-VERSION := 6
-VARIANT := x86
-include ../image.mk

6/Dockerfile

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

6/Makefile

-VARIANT := x86_64
-include ../image.mk

Makefile

 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