Skip to content

Commit c675d13

Browse files
committed
Update CentOS 6 x86 to devtoolset-8
1 parent 979119e commit c675d13

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# CentOS-buildlogs-devtoolset-8.repo
2+
#
3+
# Please see https://www.mail-archive.com/centos@centos.org/msg133717.html
4+
# for more information
5+
6+
[centos-buildlogs-devtoolset-8]
7+
name=CentOS-6 - buildlogs devtoolset-8
8+
baseurl=https://buildlogs.centos.org/c6-devtoolset-8.x86_64/
9+
#mirrorlist=http://mirrorlist.centos.org?arch=$basearch&release=6&repo=sclo-sclo
10+
gpgcheck=0
11+
enabled=1
12+
gpgkey=

centos6_x86/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ MAINTAINER Evolved Binary Ltd <tech@evolvedbinary.com>
55
LABEL name="CentOS 6 (x86) RocksJava Build Environment" \
66
vendor="Evolved Binary Ltd"
77

8+
COPY CentOS-buildlogs-devtoolset-8.repo /etc/yum.repos.d/CentOS-buildlogs-devtoolset-8.repo
9+
810
RUN curl --fail https://vault.centos.org/6.10/os/i386/Packages/udev-147-2.73.el6_8.2.i686.rpm --output /tmp/udev-147-2.73.el6_8.2.i686.rpm \
911
&& rpm -Uvh /tmp/udev-147-2.73.el6_8.2.i686.rpm --nodeps \
1012
&& rm -f /tmp/udev-147-2.73.el6_8.2.i686.rpm \
@@ -19,15 +21,14 @@ RUN curl --fail https://vault.centos.org/6.10/os/i386/Packages/udev-147-2.73.el6
1921
&& linux32 yum --setopt=tsflags=nodocs -y update \
2022
&& linux32 yum --setopt=tsflags=nodocs -y install epel-release \
2123
&& linux32 yum --setopt=tsflags=nodocs -y install wget tar which \
22-
&& curl --fail https://people.centos.org/tru/devtools-2/devtools-2.repo --output /etc/yum.repos.d/devtools-2.repo \
23-
&& linux32 yum --setopt=tsflags=nodocs -y install make perl devtoolset-2-binutils devtoolset-2-gcc devtoolset-2-gcc-c++ cmake3 \
24+
&& linux32 yum --setopt=tsflags=nodocs -y install make perl devtoolset-8 cmake3 \
2425
&& linux32 yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel \
2526
&& linux32 yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel \
2627
&& linux32 yum -y clean all \
2728
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
2829
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
2930
&& curl --fail https://codeload.github.com/gflags/gflags/tar.gz/v2.0 --output /tmp/gflags-2.0.tar.gz \
30-
&& cd /tmp && tar xvfz gflags-2.0.tar.gz; cd gflags-2.0; linux32 scl enable devtoolset-2 ./configure; linux32 scl enable devtoolset-2 make; linux32 scl enable devtoolset-2 'make install'; cd ..; rm -rf gflags-2.0*
31+
&& cd /tmp && tar xvfz gflags-2.0.tar.gz; cd gflags-2.0; linux32 scl enable devtoolset-8 ./configure; linux32 scl enable devtoolset-8 make; linux32 scl enable devtoolset-8 'make install'; cd ..; rm -rf gflags-2.0*
3132

3233
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
3334
ENV PATH=$JAVA_HOME:$PATH

0 commit comments

Comments
 (0)