From 845b084fa4075bbff96e81d919be88b8d0064e09 Mon Sep 17 00:00:00 2001
From: zwwhdls <weiwei.zhu@juicefs.io>
Date: Wed, 5 Jul 2023 18:05:46 +0800
Subject: [PATCH] make image

---
 .github/scripts/deploy-csi-in-k8s.sh | 4 ++--
 docker/Dockerfile                    | 8 ++++----
 docker/ce.juicefs.Dockerfile         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/deploy-csi-in-k8s.sh b/.github/scripts/deploy-csi-in-k8s.sh
index a8a8619cb1..8f9755be20 100755
--- a/.github/scripts/deploy-csi-in-k8s.sh
+++ b/.github/scripts/deploy-csi-in-k8s.sh
@@ -31,10 +31,10 @@ function prepare_pkg() {
   sudo dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_amd64.deb
 
   # gluster
-  sudo wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | sudo apt-key add -
+  sudo wget -O - https://download.gluster.org/pub/gluster/glusterfs/7/rsa.pub | sudo apt-key add -
   sudo mkdir mkdir /etc/apt/sources.list.d/gluster.list
   sudo chmod 777 /etc/apt/sources.list.d/gluster.list
-  sudo echo deb [arch=amd64] https://download.gluster.org/pub/gluster/glusterfs/10/LATEST/Debian/buster/amd64/apt buster main > /etc/apt/sources.list.d/gluster.list
+  sudo echo deb [arch=amd64] https://download.gluster.org/pub/gluster/glusterfs/7/LATEST/Debian/buster/amd64/apt buster main > /etc/apt/sources.list.d/gluster.list
   sudo apt-get update
   sudo apt-get install -y uuid-dev libglusterfs-dev
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4909b20a7f..6cdbcfdb3f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,8 +23,8 @@ ARG JUICEFS_CSI_REPO_REF=master
 RUN apt update && apt install -y software-properties-common && apt update && \
     wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
     apt-add-repository 'deb https://download.ceph.com/debian-pacific/ buster main' && \
-    wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
-    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/10/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
+    wget -O - https://download.gluster.org/pub/gluster/glusterfs/7/rsa.pub | apt-key add - && \
+    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/7/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
     apt update
 
 WORKDIR /workspace
@@ -59,8 +59,8 @@ RUN chmod +x /tini
 RUN apt update && apt install -y software-properties-common wget gnupg gnupg2 && apt update && \
     wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
     apt-add-repository 'deb https://download.ceph.com/debian-pacific/ buster main' && \
-    wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
-    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/10/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
+    wget -O - https://download.gluster.org/pub/gluster/glusterfs/7/rsa.pub | apt-key add - && \
+    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/7/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
     apt update
 
 RUN apt-get update && apt-get install -y librados2 librados-dev libcephfs-dev librbd-dev curl fuse procps iputils-ping strace iproute2 net-tools tcpdump lsof uuid-dev libglusterfs-dev && \
diff --git a/docker/ce.juicefs.Dockerfile b/docker/ce.juicefs.Dockerfile
index 2febf33cad..ba804bac7c 100644
--- a/docker/ce.juicefs.Dockerfile
+++ b/docker/ce.juicefs.Dockerfile
@@ -25,8 +25,8 @@ ENV GOPROXY=${GOPROXY:-https://proxy.golang.org}
 RUN mkdir -p /home/travis/.m2 && \
     wget -O /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
     dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
-    wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
-    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/10/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
+    wget -O - https://download.gluster.org/pub/gluster/glusterfs/7/rsa.pub | apt-key add - && \
+    echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/7/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
     apt-get update && apt-get install -y musl-tools upx-ucl librados-dev libcephfs-dev librbd-dev uuid-dev libglusterfs-dev && \
     cd /workspace && git clone --branch=$JUICEFS_REPO_BRANCH $JUICEFS_REPO_URL && \
     cd juicefs && git checkout $JUICEFS_REPO_REF && go get github.com/ceph/go-ceph@v0.4.0 && go mod tidy && \