Module: check_mk
Branch: master
Commit: 411ad81f3c4c0dc51340a341eb0af26aacd9a7f2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=411ad81f3c4c0d…
Author: Alex Zurhake <az(a)mathias-kettner.de>
Date: Thu Jan 24 10:48:03 2019 +0100
CMK-1549 Docker containers to build on all supported Centos distros
Change-Id: I83142620a532902c16b95094c5452ec3d638d8b4
---
.../infrastructure/build-nodes/centos-6/Dockerfile | 83 +++++++++-------------
.../infrastructure/build-nodes/centos-7/Dockerfile | 63 ++++++++++++++++
2 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/buildscripts/infrastructure/build-nodes/centos-6/Dockerfile
b/buildscripts/infrastructure/build-nodes/centos-6/Dockerfile
index 283940f..9c301fb 100644
--- a/buildscripts/infrastructure/build-nodes/centos-6/Dockerfile
+++ b/buildscripts/infrastructure/build-nodes/centos-6/Dockerfile
@@ -3,77 +3,60 @@ FROM centos:6
SHELL ["/bin/bash", "-c"]
RUN yum -y makecache \
- \
&& yum -y install \
+ bind-utils \
boost-devel \
+ centos-release-scl \
+ compat-readline5 \
curl-devel \
expat-devel \
- bind-utils \
+ flex \
+ freeradius-devel \
gcc \
gcc-c++ \
- libevent-devel \
- libtool-ltdl-devel \
- libtool-ltdl \
gd-devel \
+ gettext \
+ git \
+ groff \
+ httpd-devel \
libXpm-devel \
+ libevent-devel \
+ libffi-devel \
+ libgsf-devel \
libjpeg-devel \
- httpd-devel \
libmcrypt-devel \
+ libpcap-devel \
+ libtool-ltdl \
+ libtool-ltdl-devel \
+ libuuid-devel \
libxml2-devel \
- sqlite-devel \
- tk-devel \
mysql-devel \
- postgresql-devel \
ncurses-devel \
+ openssh-clients \
openssl-devel \
pango-devel \
- pcre-devel \
patch \
+ pcre-devel \
+ pcre-devel \
+ perl-ExtUtils-Embed \
+ perl-Time-HiRes \
+ perl-devel \
php \
+ postgresql-devel \
readline-devel \
- compat-readline5 \
+ rpcbind \
rpm-build \
+ rrdtool-devel \
+ rsync \
samba-client \
- rpcbind \
- libuuid-devel \
+ sqlite-devel \
+ texinfo \
+ tk-devel \
which \
- perl-devel \
- perl-ExtUtils-Embed \
- perl-Time-HiRes \
- rsync \
- freeradius-devel \
- groff \
- pcre-devel \
- libpcap-devel \
- gettext \
- libgsf-devel \
- rrdtool-devel \
- libffi-devel \
- flex \
- openssh-clients \
- git \
- && yum clean all
-
-RUN yum -y makecache \
- \
- && yum -y install \
wget \
+ && yum -y install devtoolset-7 \
&& yum clean all
-COPY bw-build-gnu-toolchain /usr/sbin
-# Nasty, nasty workaround...
-# This will be moved to a jenkinsfile to build containers
-# to avoid cloning and packing the binutils too often
-RUN cd /tmp/build-gcc-toolchain/ \
- && git clone
git://sourceware.org/git/binutils-gdb.git \
- && cd binutils-gdb \
- && git reset --hard bb27775165d9b992120371383012404e213b1981 \
- && git clean -dfX \
- && ./src-release.sh -x binutils \
- && cd .. \
- && ln -s binutils-gdb/binutils-2.31.51.tar.xz binutils-2.31.1.tar.xz
-
-RUN bw-build-gnu-toolchain
-RUN mv /usr/bin/gcc /usr/bin/gcc-4 \
- && ln -s /usr/local/bin/gcc-8 /usr/local/bin/gcc \
- && ln -s /usr/local/bin/gcc-8 /usr/local/bin/cc
+COPY bw-build-gnu-toolchain.sh /usr/sbin
+RUN source scl_source enable devtoolset-7 \
+ && bw-build-gnu-toolchain.sh -b
diff --git a/buildscripts/infrastructure/build-nodes/centos-7/Dockerfile
b/buildscripts/infrastructure/build-nodes/centos-7/Dockerfile
new file mode 100644
index 0000000..1fbd2f6
--- /dev/null
+++ b/buildscripts/infrastructure/build-nodes/centos-7/Dockerfile
@@ -0,0 +1,63 @@
+FROM centos:7
+
+SHELL ["/bin/bash", "-c"]
+
+RUN yum -y makecache \
+ && yum -y install \
+ bind-utils \
+ boost-devel \
+ curl-devel \
+ expat-devel \
+ flex \
+ flex-devel \
+ freeradius-devel \
+ gcc \
+ gcc-c++ \
+ gd-devel \
+ gettext \
+ groff \
+ httpd-devel \
+ libXpm-devel \
+ libdbi-devel \
+ libevent-devel \
+ libffi-devel \
+ libgsf-devel \
+ libjpeg-devel \
+ libmcrypt-devel \
+ libpcap-devel \
+ libtool-ltdl \
+ libtool-ltdl-devel \
+ libuuid-devel \
+ libxml2-devel \
+ mariadb-devel \
+ ncurses-devel \
+ openssh-clients \
+ openssl-devel \
+ pango-devel \
+ patch \
+ pcre-devel \
+ perl-ExtUtils-Embed \
+ perl-IO-Zlib \
+ perl-Locale-Maketext-Simple \
+ perl-Time-HiRes \
+ perl-devel \
+ php \
+ postgresql-devel \
+ readline-devel \
+ rpcbind \
+ rpm-build \
+ rrdtool-devel \
+ rsync \
+ samba-client \
+ sqlite-devel \
+ texinfo \
+ tk-devel \
+ wget \
+ which \
+ && yum clean all
+
+COPY bw-build-gnu-toolchain.sh /usr/sbin
+RUN bw-build-gnu-toolchain.sh -b
+RUN mv /usr/bin/gcc /usr/bin/gcc-4 \
+ && ln -s /usr/local/bin/gcc-8 /usr/local/bin/gcc \
+ && ln -s /usr/local/bin/gcc-8 /usr/local/bin/cc