This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch fix-github-zk-hadoop
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/fix-github-zk-hadoop by this
push:
new b1b87facc fix yum
b1b87facc is described below
commit b1b87facca4ab152a66d59ea48ea8feb17b40108
Author: Dan Wang <wang...@apache.org>
AuthorDate: Mon Sep 30 14:50:11 2024 +0800
fix yum
---
docker/pegasus-build-env/centos7/Dockerfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker/pegasus-build-env/centos7/Dockerfile
b/docker/pegasus-build-env/centos7/Dockerfile
index 9a794eed7..81155415d 100644
--- a/docker/pegasus-build-env/centos7/Dockerfile
+++ b/docker/pegasus-build-env/centos7/Dockerfile
@@ -22,15 +22,15 @@ LABEL maintainer=wutao
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
- yum --setopt=basearch=x86_64 -y install centos-release-scl \
+ yum -y install centos-release-scl \
scl-utils \
- epel-release && \
+ epel-release --exclude=aarch64 && \
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
- yum --setopt=basearch=x86_64 -y install \
- devtoolset-7-gcc \
- devtoolset-7-gcc-c++ \
+ yum -y install \
+ devtoolset-7-gcc.x86_64 \
+ devtoolset-7-gcc-c++.x86_64 \
java-1.8.0-openjdk-devel.x86_64 \
python3 \
automake \
@@ -55,8 +55,8 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g
/etc/yum.repos.d/*.repo && \
flex \
krb5-devel \
cyrus-sasl-devel \
- patch && \
- yum --setopt=basearch=x86_64 -y install ca-certificates && \
+ patch --exclude=aarch64 && \
+ yum --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-sclo -y install
ca-certificates && \
yum clean all && \
rm -rf /var/cache/yum;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pegasus.apache.org
For additional commands, e-mail: commits-h...@pegasus.apache.org
