Module: check_mk Branch: master Commit: e45eac1de061b6d23a4538a4157feba754b78a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e45eac1de061b6… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:50:38 2019 +0100 CMK-1824: Add sles-12sp2 to the new build mechanism Change-Id: I60609a41e353bdca847fcedc882bf31fa9b07284 --- .../build-nodes/sles-12sp2/Dockerfile | 9 +++--- .../infrastructure/os-nodes/sles-12sp2/Dockerfile | 33 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile b/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile index 6f31c09..e346c96 100644 --- a/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile +++ b/buildscripts/infrastructure/build-nodes/sles-12sp2/Dockerfile @@ -1,8 +1,8 @@ -FROM 10.9.1.101:5010/sles-12sp2-base +FROM nexus.lan.tribe29.com:5010/sles-12sp2-base SHELL ["/bin/bash", "-c"] -RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp2 sles12sp2 \ +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp2 sles12sp2 \ && zypper ref -s \ && zypper -n in -y --force-resolution \ apache2-devel \ @@ -62,5 +62,6 @@ RUN zypper addrepo -G http://10.9.1.101:8081/repository/sles12sp2 sles12sp2 \ COPY bw-build-gnu-toolchain.sh /usr/sbin RUN bw-build-gnu-toolchain.sh -b - -RUN rm /usr/bin/gcc /usr/bin/g++ +RUN rm /usr/bin/gcc /usr/bin/g++ \ + && ln -s /opt/gcc-8.2.0/bin/gcc-8 /usr/bin/gcc \ + && ln -s /opt/gcc-8.2.0/bin/g++-8 /usr/bin/g++ diff --git a/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile b/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile new file mode 100644 index 0000000..969ca10 --- /dev/null +++ b/buildscripts/infrastructure/os-nodes/sles-12sp2/Dockerfile @@ -0,0 +1,33 @@ +FROM nexus.lan.tribe29.com:5010/sles-12sp2-base + +SHELL ["/bin/bash", "-c"] + +ARG PACKAGES + +RUN zypper addrepo -G http://nexus:8081/repository/sles12sp2 sles12sp2 \ + && zypper addrepo -G http://nexus:8081/repository/sles12spx-web-scripting web-scripting \ + && zypper -n --no-gpg-checks in --replacefiles --force-resolution \ + curl \ + cyrus-sasl-devel \ + enchant-devel \ + git \ + krb5-devel \ + libmysqlclient-devel \ + make \ + nodejs10 \ + npm10 \ + openldap2-devel \ + python \ + python-devel \ + python-pyOpenSSL \ + python-xml \ + rrdtool-devel \ + sudo \ + && zypper clean -a +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py +RUN pip install --upgrade setuptools \ + && pip install git+https://github.com/pypa/pipenv.git \ + && zypper -n --no-gpg-checks in --replacefiles \ + $PACKAGES \ + && zypper clean -a