Skip to content

Commit b1b87fa

Browse files
committed
fix yum
1 parent 16a97a7 commit b1b87fa

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

docker/pegasus-build-env/centos7/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ LABEL maintainer=wutao
2222
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
2323
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
2424
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
25-
yum --setopt=basearch=x86_64 -y install centos-release-scl \
25+
yum -y install centos-release-scl \
2626
scl-utils \
27-
epel-release && \
27+
epel-release --exclude=aarch64 && \
2828
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
2929
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
3030
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
31-
yum --setopt=basearch=x86_64 -y install \
32-
devtoolset-7-gcc \
33-
devtoolset-7-gcc-c++ \
31+
yum -y install \
32+
devtoolset-7-gcc.x86_64 \
33+
devtoolset-7-gcc-c++.x86_64 \
3434
java-1.8.0-openjdk-devel.x86_64 \
3535
python3 \
3636
automake \
@@ -55,8 +55,8 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
5555
flex \
5656
krb5-devel \
5757
cyrus-sasl-devel \
58-
patch && \
59-
yum --setopt=basearch=x86_64 -y install ca-certificates && \
58+
patch --exclude=aarch64 && \
59+
yum --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-sclo -y install ca-certificates && \
6060
yum clean all && \
6161
rm -rf /var/cache/yum;
6262

0 commit comments

Comments
 (0)