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 16a97a7c4 fix yum
16a97a7c4 is described below

commit 16a97a7c43fe99a884c2b7b26fea6d90af36ebdb
Author: Dan Wang <[email protected]>
AuthorDate: Mon Sep 30 14:39:39 2024 +0800

    fix yum
---
 docker/pegasus-build-env/centos7/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/pegasus-build-env/centos7/Dockerfile 
b/docker/pegasus-build-env/centos7/Dockerfile
index 2fd302707..9a794eed7 100644
--- a/docker/pegasus-build-env/centos7/Dockerfile
+++ b/docker/pegasus-build-env/centos7/Dockerfile
@@ -22,13 +22,13 @@ 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 -y install centos-release-scl \
+    yum --setopt=basearch=x86_64 -y install centos-release-scl \
                    scl-utils \
-                   epel-release --exclude=aarch64 && \
+                   epel-release && \
     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 --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-sclo -y install 
\
+    yum --setopt=basearch=x86_64 -y install \
                    devtoolset-7-gcc \
                    devtoolset-7-gcc-c++ \
                    java-1.8.0-openjdk-devel.x86_64 \
@@ -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 --exclude=aarch64 && \
-    yum --disablerepo=centos-sclo-rh --disablerepo=centos-sclo-sclo -y install 
ca-certificates && \
+                   patch && \
+    yum --setopt=basearch=x86_64 -y install ca-certificates && \
     yum clean all && \
     rm -rf /var/cache/yum;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to