Skip to content

Commit ae0467d

Browse files
committed
wut
1 parent 53d63d1 commit ae0467d

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

docker/csi.Dockerfile

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ ARG GOPROXY
1717
ARG TARGETARCH
1818

1919
WORKDIR /workspace
20-
COPY --from=project **/*.go ./
21-
COPY --from=project cmd ./cmd
22-
COPY --from=project pkg ./pkg
23-
COPY --from=project go.mod .
24-
COPY --from=project go.sum .
25-
COPY --from=project .git .
26-
COPY --from=project Makefile .
20+
COPY **/*.go ./
21+
COPY cmd ./cmd
22+
COPY pkg ./pkg
23+
COPY go.mod .
24+
COPY go.sum .
25+
COPY .git .
26+
COPY Makefile .
2727
ENV GOPROXY=${GOPROXY:-https://proxy.golang.org}
2828
RUN make
2929

@@ -35,19 +35,19 @@ ARG JUICEFS_REPO_BRANCH=main
3535
ARG JUICEFS_REPO_REF=${JUICEFS_REPO_BRANCH}
3636

3737
RUN bash -c "if [[ '${TARGETARCH}' == amd64 ]]; then mkdir -p /home/travis/.m2 && \
38-
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 && \
39-
dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
40-
wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
41-
echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/11/LATEST/Debian/bullseye/${TARGETARCH}/apt bullseye main > /etc/apt/sources.list.d/gluster.list && \
42-
wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
43-
echo deb https://download.ceph.com/debian-16.2.15/ bullseye main | tee /etc/apt/sources.list.d/ceph.list && \
44-
apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev upx-ucl; fi"
38+
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 && \
39+
dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
40+
wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
41+
echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/11/LATEST/Debian/bullseye/${TARGETARCH}/apt bullseye main > /etc/apt/sources.list.d/gluster.list && \
42+
wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
43+
echo deb https://download.ceph.com/debian-16.2.15/ bullseye main | tee /etc/apt/sources.list.d/ceph.list && \
44+
apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev upx-ucl; fi"
4545
WORKDIR /workspace
4646
RUN apt-get update && apt-get install -y musl-tools
4747
# build juicefs
4848
RUN cd /workspace && git clone --branch=$JUICEFS_REPO_BRANCH $JUICEFS_REPO_URL && \
49-
cd juicefs && git checkout $JUICEFS_REPO_REF && \
50-
bash -c "if [[ ${TARGETARCH} == amd64 ]]; then make juicefs.all && mv juicefs.all juicefs; else make juicefs; fi"
49+
cd juicefs && git checkout $JUICEFS_REPO_REF && \
50+
bash -c "if [[ ${TARGETARCH} == amd64 ]]; then make juicefs.all && mv juicefs.all juicefs; else make juicefs; fi"
5151

5252
FROM python:3.9.21-slim-bullseye
5353

@@ -68,26 +68,26 @@ ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini-${TARGETARCH}
6868
RUN chmod +x /tini
6969

7070
RUN apt update && \
71-
bash -c "if [[ ${TARGETARCH} == amd64 ]]; then apt install -y software-properties-common wget gnupg gnupg2 && mkdir -p /home/travis/.m2 && \
72-
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 && \
73-
dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
74-
wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
75-
echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/11/LATEST/Debian/bullseye/${TARGETARCH}/apt bullseye main > /etc/apt/sources.list.d/gluster.list && \
76-
wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
77-
echo deb https://download.ceph.com/debian-16.2.15/ bullseye main | tee /etc/apt/sources.list.d/ceph.list && \
78-
apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev; fi"
71+
bash -c "if [[ ${TARGETARCH} == amd64 ]]; then apt install -y software-properties-common wget gnupg gnupg2 && mkdir -p /home/travis/.m2 && \
72+
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 && \
73+
dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
74+
wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \
75+
echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/11/LATEST/Debian/bullseye/${TARGETARCH}/apt bullseye main > /etc/apt/sources.list.d/gluster.list && \
76+
wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
77+
echo deb https://download.ceph.com/debian-16.2.15/ bullseye main | tee /etc/apt/sources.list.d/ceph.list && \
78+
apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev; fi"
7979

8080
RUN apt-get update && apt-get install -y curl fuse procps iputils-ping strace iproute2 net-tools tcpdump lsof && \
81-
rm -rf /var/cache/apt/* && mkdir -p /root/.juicefs && \
82-
ln -s /usr/local/bin/python /usr/bin/python && \
83-
mkdir /root/.acl && cp /etc/passwd /root/.acl/passwd && cp /etc/group /root/.acl/group && \
84-
ln -sf /root/.acl/passwd /etc/passwd && ln -sf /root/.acl/group /etc/group
81+
rm -rf /var/cache/apt/* && mkdir -p /root/.juicefs && \
82+
ln -s /usr/local/bin/python /usr/bin/python && \
83+
mkdir /root/.acl && cp /etc/passwd /root/.acl/passwd && cp /etc/group /root/.acl/group && \
84+
ln -sf /root/.acl/passwd /etc/passwd && ln -sf /root/.acl/group /etc/group
8585

8686
RUN jfs_mount_path=${JFS_MOUNT_PATH} && \
87-
bash -c "if [[ '${JFSCHAN}' == beta ]]; then curl -sSL https://static.juicefs.com/release/bin_pkgs/beta_full.tar.gz | tar -xz; jfs_mount_path=${JFS_MOUNT_PATH}.beta; \
88-
else curl -sSL https://static.juicefs.com/release/bin_pkgs/latest_stable_full.tar.gz | tar -xz; fi;" && \
89-
bash -c "mkdir -p /usr/local/juicefs/mount; if [[ '${TARGETARCH}' == amd64 ]]; then cp Linux/mount.ceph $jfs_mount_path; else cp Linux/mount.aarch64 $jfs_mount_path; fi;" && \
90-
chmod +x ${jfs_mount_path} && cp juicefs.py ${JUICEFS_CLI} && chmod +x ${JUICEFS_CLI}
87+
bash -c "if [[ '${JFSCHAN}' == beta ]]; then curl -sSL https://static.juicefs.com/release/bin_pkgs/beta_full.tar.gz | tar -xz; jfs_mount_path=${JFS_MOUNT_PATH}.beta; \
88+
else curl -sSL https://static.juicefs.com/release/bin_pkgs/latest_stable_full.tar.gz | tar -xz; fi;" && \
89+
bash -c "mkdir -p /usr/local/juicefs/mount; if [[ '${TARGETARCH}' == amd64 ]]; then cp Linux/mount.ceph $jfs_mount_path; else cp Linux/mount.aarch64 $jfs_mount_path; fi;" && \
90+
chmod +x ${jfs_mount_path} && cp juicefs.py ${JUICEFS_CLI} && chmod +x ${JUICEFS_CLI}
9191

9292
COPY --from=csi-builder /workspace/bin/juicefs-csi-driver /usr/local/bin/
9393
COPY --from=juicefs-builder /workspace/juicefs/juicefs /usr/local/bin/

0 commit comments

Comments
 (0)