fixing errors

Committed-by: xiaolei.zl from Dev container
alibaba · Aug 6, 2024 · 4fcd3d6 · 4fcd3d6
1 parent 1470925
commit 4fcd3d6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -43,7 +43,7 @@ jobs:
         fi
         sudo mkdir /opt/graphscope
         sudo chown -R $(id -u):$(id -g) /opt/graphscope
-        python3 -m pip install click 
+        python3 -m pip install click  packaging
         python3 gsctl.py install-deps dev --v6d-version v0.22.0
 
     - name: Setup tmate session

diff --git a/k8s/dockerfiles/graphscope-dev.Dockerfile b/k8s/dockerfiles/graphscope-dev.Dockerfile
@@ -30,7 +30,7 @@ WORKDIR /home/graphscope
 COPY --chown=graphscope:graphscope gsctl /home/graphscope/gsctl
 ARG VINEYARD_VERSION=main
 RUN cd /home/graphscope/gsctl && \
-    python3 -m pip install click && \
+    python3 -m pip install click packaging && \
     python3 gsctl.py install-deps dev --v6d-version=$VINEYARD_VERSION --cn -j $(nproc) && \
     cd /home/graphscope && \
     rm -fr gsctl

diff --git a/k8s/dockerfiles/manylinux2014-ext.Dockerfile b/k8s/dockerfiles/manylinux2014-ext.Dockerfile
@@ -6,6 +6,11 @@ FROM centos:7 AS builder
 
 # shanghai zoneinfo
 ENV TZ=Asia/Shanghai
+
+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;
+
 RUN yum install sudo -y && \
     yum update glibc-common -y  && \
     sudo localedef -i en_US -f UTF-8 en_US.UTF-8 && \    
@@ -18,7 +23,7 @@ ENV LANG=en_US.utf-8
 
 COPY gsctl ./gsctl
 RUN cd ./gsctl && \
-    python3 -m pip install click && \ 
+    python3 -m pip install click packaging && \ 
     python3 gsctl.py install-deps dev --cn --for-analytical --no-v6d  -j $(nproc) && \
     rm -fr /root/gsctl
 
@@ -36,6 +41,10 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then \
 
 FROM centos:7
 
+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;
+
 COPY --from=builder /opt/graphscope /opt/graphscope
 COPY --from=builder /opt/openmpi /opt/openmpi
 COPY --from=builder /opt/hadoop-3.3.0 /opt/hadoop-3.3.0
diff --git a/k8s/dockerfiles/manylinux2014.Dockerfile b/k8s/dockerfiles/manylinux2014.Dockerfile
@@ -57,7 +57,7 @@ WORKDIR /home/graphscope
 COPY --chown=graphscope:graphscope gsctl /home/graphscope/gsctl
 ARG VINEYARD_VERSION=main
 RUN cd /home/graphscope/gsctl && \
-    sudo python3 -m pip install click && \ 
+    sudo python3 -m pip install click packaging && \ 
     python3 gsctl.py install-deps dev --v6d-version=$VINEYARD_VERSION -j $(nproc) && \
     cd /home/graphscope && sudo rm -rf /home/graphscope/gsctl && \
     sudo yum clean all -y && \

diff --git a/k8s/dockerfiles/vineyard-dev.Dockerfile b/k8s/dockerfiles/vineyard-dev.Dockerfile
@@ -42,7 +42,7 @@ COPY --chown=graphscope:graphscope gsctl /home/graphscope/gsctl
 ARG VINEYARD_VERSION=main
 RUN sudo chmod a+wrx /tmp && \
     cd /home/graphscope/gsctl && \
-    python3 -m pip install click && \
+    python3 -m pip install click packaging && \
     python3 gsctl.py install-deps dev --for-analytical --v6d-version=$VINEYARD_VERSION -j $(nproc) && \
     cd /home/graphscope && sudo rm -rf /home/graphscope/gsctl
 

diff --git a/k8s/internal/dataset.Dockerfile b/k8s/internal/dataset.Dockerfile
@@ -1,5 +1,8 @@
 FROM centos:7
 
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-*
+
 RUN yum localinstall -y https://github.com/aliyun/ossfs/releases/download/v1.80.5/ossfs_1.80.5_centos7.0_x86_64.rpm && \
     yum clean all && \
     rm -fr /var/cache/yum