Skip to content

Commit da3f496

Browse files
committed
update arm64v8 for gcc 11, and disable ssl certificates
1 parent fd4da1f commit da3f496

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

centos7_arm64v8/Dockerfile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN \
4242
&& sed -i s%#\\sbaseurl=http://mirror.centos.org/centos/7/%baseurl=https://vault.centos.org/altarch/7.9.2009/%g /etc/yum.repos.d/CentOS-SCLo-scl.repo \
4343
&& sed -i s%#baseurl=http://mirror.centos.org/centos/7/%baseurl=https://vault.centos.org/altarch/7.9.2009/%g /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo \
4444
&& yum --setopt=tsflags=nodocs -y upgrade \
45-
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 \
45+
&& yum --setopt=tsflags=nodocs -y install devtoolset-11 \
4646
&& yum --setopt=tsflags=nodocs -y install make perl python3 which bzip2 wget \
4747
&& yum --setopt=tsflags=nodocs -y install gettext-devel openssl openssl-devel zlib-devel expat-devel libssh2-devel jemalloc-devel \
4848
&& yum -y clean all
@@ -54,9 +54,9 @@ RUN \
5454
wget https://github.com/nghttp2/nghttp2/releases/download/v$NGHTTP2_VERSION/nghttp2-$NGHTTP2_VERSION.tar.gz \
5555
&& tar zxf nghttp2-$NGHTTP2_VERSION.tar.gz \
5656
&& pushd nghttp2-$NGHTTP2_VERSION \
57-
&& scl enable devtoolset-7 './configure --prefix=/usr --with-openssl --with-zlib --with-jemalloc --enable-lib-only' \
58-
&& scl enable devtoolset-7 'make -j $JOBS' \
59-
&& scl enable devtoolset-7 'make install' \
57+
&& scl enable devtoolset-11 './configure --prefix=/usr --with-openssl --with-zlib --with-jemalloc --enable-lib-only' \
58+
&& scl enable devtoolset-11 'make -j $JOBS' \
59+
&& scl enable devtoolset-11 'make install' \
6060
&& popd \
6161
&& rm -rf nghttp2-$NGHTTP2_VERSION nghttp2-$NGHTTP2_VERSION.tar.gz
6262

@@ -67,9 +67,9 @@ RUN \
6767
wget https://github.com/rockdaboot/libpsl/releases/download/$LIBPSL_VERSION/libpsl-$LIBPSL_VERSION.tar.gz \
6868
&& tar zxf libpsl-$LIBPSL_VERSION.tar.gz \
6969
&& pushd libpsl-$LIBPSL_VERSION \
70-
&& scl enable devtoolset-7 './configure --prefix=/usr' \
71-
&& scl enable devtoolset-7 'make -j $JOBS' \
72-
&& scl enable devtoolset-7 'make install' \
70+
&& scl enable devtoolset-11 './configure --prefix=/usr' \
71+
&& scl enable devtoolset-11 'make -j $JOBS' \
72+
&& scl enable devtoolset-11 'make install' \
7373
&& popd \
7474
&& rm -rf libpsl-$LIBPSL_VERSION libpsl-$LIBPSL_VERSION.tar.gz
7575

@@ -98,9 +98,9 @@ RUN \
9898
&& wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz \
9999
&& tar zxf curl-$CURL_VERSION.tar.gz \
100100
&& pushd curl-$CURL_VERSION \
101-
&& scl enable devtoolset-7 './configure --prefix=/usr --enable-ipv6 --enable-unix-sockets --with-ssl --with-libssh2' \
102-
&& scl enable devtoolset-7 'make -j $JOBS' \
103-
&& scl enable devtoolset-7 'make install' \
101+
&& scl enable devtoolset-11 './configure --prefix=/usr --enable-ipv6 --enable-unix-sockets --with-ssl --with-libssh2' \
102+
&& scl enable devtoolset-11 'make -j $JOBS' \
103+
&& scl enable devtoolset-11 'make install' \
104104
&& popd \
105105
&& rm -rf curl-$CURL_VERSION curl-$CURL_VERSION.tar.gz
106106

@@ -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-
&& scl enable devtoolset-7 'make configure' \
150-
&& scl enable devtoolset-7 'NO_PERL=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease ./configure --prefix=/usr' \
151-
&& scl enable devtoolset-7 'make -j $JOBS all' \
152-
&& scl enable devtoolset-7 'make install' \
149+
&& scl enable devtoolset-11 'make configure' \
150+
&& scl enable devtoolset-11 'NO_PERL=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease ./configure --prefix=/usr' \
151+
&& scl enable devtoolset-11 'make -j $JOBS all' \
152+
&& scl enable devtoolset-11 'make install' \
153153
&& popd \
154154
&& rm -rf git-$GIT_VERSION git-$GIT_VERSION.tar.gz
155155

@@ -201,18 +201,18 @@ RUN \
201201
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
202202
&& tar zxvf cmake-$CMAKE_VERSION.tar.gz \
203203
&& pushd cmake-$CMAKE_VERSION \
204-
&& scl enable devtoolset-7 './bootstrap --system-curl' \
205-
&& scl enable devtoolset-7 'make -j $JOBS' \
206-
&& scl enable devtoolset-7 'make install' \
204+
&& scl enable devtoolset-11 './bootstrap --system-curl' \
205+
&& scl enable devtoolset-11 'make -j $JOBS' \
206+
&& scl enable devtoolset-11 'make install' \
207207
&& popd \
208208
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
209209
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
210210
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
211211
&& mkdir gflags-$GFLAGS_VERSION/build \
212212
&& pushd gflags-$GFLAGS_VERSION/build \
213-
&& scl enable devtoolset-7 'CMAKE_INSTALL_PREFIX=/usr cmake ..' \
214-
&& scl enable devtoolset-7 'make -j $JOBS' \
215-
&& scl enable devtoolset-7 'make install' \
213+
&& scl enable devtoolset-11 'CMAKE_INSTALL_PREFIX=/usr cmake ..' \
214+
&& scl enable devtoolset-11 'make -j $JOBS' \
215+
&& scl enable devtoolset-11 'make install' \
216216
&& popd \
217217
&& rm -rf gflags-$GFLAGS_VERSION gflags-$GFLAGS_VERSION.tar.gz
218218

centos7_arm64v8/bellsoft.repo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ baseurl=https://yum.bell-sw.com
66
enabled=1
77
gpgcheck=1
88
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9-
priority=1
9+
priority=1
10+
sslverify=0

0 commit comments

Comments
 (0)