Skip to content

Commit 93534ba

Browse files
mike-evolvedmike-evolved
committed
Upgrade from devtoolset-8 to devtoolset-12
1 parent 064cc13 commit 93534ba

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎centos7_x86/Dockerfile‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ ARG GFLAGS_VERSION=2.2.2
3232

3333

3434
# 1. Build a base CentOS 7 Build Environment
35-
COPY CentOS-buildlogs-devtoolset-8.repo /etc/yum.repos.d/CentOS-buildlogs-devtoolset-8.repo
35+
COPY CentOS-buildlogs-devtoolset-12.repo /etc/yum.repos.d/CentOS-buildlogs-devtoolset-12.repo
3636
RUN \
3737
sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.repo \
3838
&& sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-fasttrack.repo \
3939
&& sed -i s%#baseurl=http://mirror.centos.org/altarch/\$releasever/%baseurl=https://vault.centos.org/altarch/7.9.2009/%g /etc/yum.repos.d/CentOS-Base.repo \
4040
&& sed -i s%#baseurl=http://mirror.centos.org/altarch/\$releasever/%baseurl=https://vault.centos.org/altarch/7.9.2009/%g /etc/yum.repos.d/CentOS-fasttrack.repo \
4141
&& linux32 yum --setopt=tsflags=nodocs -y update \
4242
&& linux32 yum --setopt=tsflags=nodocs -y upgrade \
43-
&& linux32 yum --setopt=tsflags=nodocs -y install devtoolset-8 \
43+
&& linux32 yum --setopt=tsflags=nodocs -y install devtoolset-12 \
4444
&& linux32 yum --setopt=tsflags=nodocs -y install make perl python3 which bzip2 wget \
4545
&& linux32 yum --setopt=tsflags=nodocs -y install gettext-devel openssl openssl-devel zlib-devel expat-devel libssh2-devel \
4646
&& linux32 yum -y clean all \
4747
&& wget https://github.com/jemalloc/jemalloc/releases/download/$JEMALLOC_VERSION/jemalloc-$JEMALLOC_VERSION.tar.bz2 \
4848
&& tar jxvf jemalloc-$JEMALLOC_VERSION.tar.bz2 \
4949
&& pushd jemalloc-$JEMALLOC_VERSION \
50-
&& linux32 scl enable devtoolset-8 './configure --prefix=/usr' \
51-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
52-
&& linux32 scl enable devtoolset-8 'make install' \
50+
&& linux32 scl enable devtoolset-12 './configure --prefix=/usr' \
51+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
52+
&& linux32 scl enable devtoolset-12 'make install' \
5353
&& popd \
5454
&& rm -rf jemalloc-$JEMALLOC_VERSION jemalloc-$JEMALLOC_VERSION.tar.bz2
5555

@@ -60,9 +60,9 @@ RUN \
6060
wget https://github.com/nghttp2/nghttp2/releases/download/v$NGHTTP2_VERSION/nghttp2-$NGHTTP2_VERSION.tar.gz \
6161
&& tar zxf nghttp2-$NGHTTP2_VERSION.tar.gz \
6262
&& pushd nghttp2-$NGHTTP2_VERSION \
63-
&& linux32 scl enable devtoolset-8 './configure --prefix=/usr --with-openssl --with-zlib --with-jemalloc --enable-lib-only' \
64-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
65-
&& linux32 scl enable devtoolset-8 'make install' \
63+
&& linux32 scl enable devtoolset-12 './configure --prefix=/usr --with-openssl --with-zlib --with-jemalloc --enable-lib-only' \
64+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
65+
&& linux32 scl enable devtoolset-12 'make install' \
6666
&& popd \
6767
&& rm -rf nghttp2-$NGHTTP2_VERSION nghttp2-$NGHTTP2_VERSION.tar.gz
6868

@@ -73,9 +73,9 @@ RUN \
7373
wget https://github.com/rockdaboot/libpsl/releases/download/$LIBPSL_VERSION/libpsl-$LIBPSL_VERSION.tar.gz \
7474
&& tar zxf libpsl-$LIBPSL_VERSION.tar.gz \
7575
&& pushd libpsl-$LIBPSL_VERSION \
76-
&& linux32 scl enable devtoolset-8 './configure --prefix=/usr' \
77-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
78-
&& linux32 scl enable devtoolset-8 'make install' \
76+
&& linux32 scl enable devtoolset-12 './configure --prefix=/usr' \
77+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
78+
&& linux32 scl enable devtoolset-12 'make install' \
7979
&& popd \
8080
&& rm -rf libpsl-$LIBPSL_VERSION libpsl-$LIBPSL_VERSION.tar.gz
8181

@@ -104,9 +104,9 @@ RUN \
104104
&& wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz \
105105
&& tar zxf curl-$CURL_VERSION.tar.gz \
106106
&& pushd curl-$CURL_VERSION \
107-
&& linux32 scl enable devtoolset-8 './configure --prefix=/usr --enable-ipv6 --enable-unix-sockets --with-ssl --with-libssh2' \
108-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
109-
&& linux32 scl enable devtoolset-8 'make install' \
107+
&& linux32 scl enable devtoolset-12 './configure --prefix=/usr --enable-ipv6 --enable-unix-sockets --with-ssl --with-libssh2' \
108+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
109+
&& linux32 scl enable devtoolset-12 'make install' \
110110
&& popd \
111111
&& rm -rf curl-$CURL_VERSION curl-$CURL_VERSION.tar.gz
112112

@@ -135,7 +135,7 @@ RUN \
135135
&& ln -s libnghttp2.so.14.28.5 libnghttp2.so.14 \
136136
&& ln -s libpsl.so.5.3.5 libpsl.so \
137137
&& ln -s libpsl.so.5.3.5 libpsl.so.5 \
138-
#&& unlink libcurl.so \
138+
&& unlink libcurl.so \
139139
&& unlink libcurl.so.4 \
140140
&& rm libcurl.so.4.3.0 \
141141
&& ln -s libcurl.so.4.8.0 libcurl.so \
@@ -146,10 +146,10 @@ RUN \
146146
&& wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-$GIT_VERSION.tar.gz \
147147
&& tar zxf git-$GIT_VERSION.tar.gz \
148148
&& pushd git-$GIT_VERSION \
149-
&& linux32 scl enable devtoolset-8 'make configure' \
150-
&& linux32 scl enable devtoolset-8 'NO_PERL=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease ./configure --prefix=/usr' \
151-
&& linux32 scl enable devtoolset-8 'make -j $JOBS all' \
152-
&& linux32 scl enable devtoolset-8 'make install' \
149+
&& linux32 scl enable devtoolset-12 'make configure' \
150+
&& linux32 scl enable devtoolset-12 'NO_PERL=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease ./configure --prefix=/usr' \
151+
&& linux32 scl enable devtoolset-12 'make -j $JOBS all' \
152+
&& linux32 scl enable devtoolset-12 'make install' \
153153
&& popd \
154154
&& rm -rf git-$GIT_VERSION git-$GIT_VERSION.tar.gz
155155

@@ -183,7 +183,7 @@ RUN \
183183
&& ln -s libnghttp2.so.14.28.5 libnghttp2.so.14 \
184184
&& ln -s libpsl.so.5.3.5 libpsl.so \
185185
&& ln -s libpsl.so.5.3.5 libpsl.so.5 \
186-
#&& unlink libcurl.so \
186+
&& unlink libcurl.so \
187187
&& unlink libcurl.so.4 \
188188
&& rm libcurl.so.4.3.0 \
189189
&& ln -s libcurl.so.4.8.0 libcurl.so \
@@ -196,18 +196,18 @@ RUN \
196196
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
197197
&& tar zxvf cmake-$CMAKE_VERSION.tar.gz \
198198
&& pushd cmake-$CMAKE_VERSION \
199-
&& linux32 scl enable devtoolset-8 './bootstrap --system-curl' \
200-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
201-
&& linux32 scl enable devtoolset-8 'make install' \
199+
&& linux32 scl enable devtoolset-12 './bootstrap --system-curl' \
200+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
201+
&& linux32 scl enable devtoolset-12 'make install' \
202202
&& popd \
203203
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
204204
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
205205
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
206206
&& mkdir gflags-$GFLAGS_VERSION/build \
207207
&& pushd gflags-$GFLAGS_VERSION/build \
208-
&& linux32 scl enable devtoolset-8 'CMAKE_INSTALL_PREFIX=/usr cmake ..' \
209-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
210-
&& linux32 scl enable devtoolset-8 'make install' \
208+
&& linux32 scl enable devtoolset-12 'CMAKE_INSTALL_PREFIX=/usr cmake ..' \
209+
&& linux32 scl enable devtoolset-12 'make -j $JOBS' \
210+
&& linux32 scl enable devtoolset-12 'make install' \
211211
&& popd \
212212
&& rm -rf gflags-$GFLAGS_VERSION gflags-$GFLAGS_VERSION.tar.gz
213213

0 commit comments

Comments
 (0)