From 5cfb876f60f6f554616a218d54d0a181e4472357 Mon Sep 17 00:00:00 2001 From: zwwhdls Date: Tue, 4 Jul 2023 15:13:10 +0800 Subject: [PATCH] fix dockerfile for gluster --- .github/workflows/nightly.yaml | 1 + docker/Dockerfile | 6 +++--- docker/ce.juicefs.Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 94171a8f57..302fc73f6e 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -5,6 +5,7 @@ on: push: branches: - master + - fix/dockerfile schedule: - cron: "0 0 * * *" diff --git a/docker/Dockerfile b/docker/Dockerfile index 681b4619a5..07a78bd89e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,12 +26,12 @@ RUN apt update && apt install -y software-properties-common && apt update && \ WORKDIR /workspace ENV GOPROXY=${GOPROXY:-https://proxy.golang.org} -RUN apt-get update && apt-get install -y musl-tools upx-ucl librados-dev libcephfs-dev librbd-dev && \ +RUN apt-get update && apt-get install -y musl-tools upx-ucl librados-dev libcephfs-dev librbd-dev uuid-dev libglusterfs-dev && \ git clone https://github.com/juicedata/juicefs-csi-driver && \ cd juicefs-csi-driver && git checkout $JUICEFS_CSI_REPO_REF && make && \ cd /workspace && git clone --branch=$JUICEFS_REPO_BRANCH https://github.com/juicedata/juicefs && \ cd juicefs && git checkout $JUICEFS_REPO_REF && go get github.com/ceph/go-ceph@v0.4.0 && go mod tidy && \ - make juicefs.ceph && mv juicefs.ceph juicefs + make juicefs.all && mv juicefs.all juicefs FROM python:3.8-slim-buster @@ -56,7 +56,7 @@ RUN apt update && apt install -y software-properties-common wget gnupg gnupg2 && apt-add-repository 'deb https://download.ceph.com/debian-pacific/ buster main' && \ 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 && \ +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 && \ rm -rf /var/cache/apt/* && \ curl -sSL https://juicefs.com/static/juicefs -o ${JUICEFS_CLI} && chmod +x ${JUICEFS_CLI} && \ mkdir -p /root/.juicefs && \ diff --git a/docker/ce.juicefs.Dockerfile b/docker/ce.juicefs.Dockerfile index 74843a84c1..0562a82fe4 100644 --- a/docker/ce.juicefs.Dockerfile +++ b/docker/ce.juicefs.Dockerfile @@ -21,9 +21,9 @@ ARG JUICEFS_REPO_REF=${JUICEFS_REPO_BRANCH} WORKDIR /workspace ENV GOPROXY=${GOPROXY:-https://proxy.golang.org} -RUN apt-get update && apt-get install -y musl-tools upx-ucl librados-dev libcephfs-dev librbd-dev && \ +RUN 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 && \ - make juicefs.ceph && mv juicefs.ceph juicefs && mv juicefs /usr/local/bin/juicefs + make juicefs.all && mv juicefs.all juicefs && mv juicefs /usr/local/bin/juicefs RUN ln -s /usr/local/bin/juicefs /bin/mount.juicefs && /usr/local/bin/juicefs --version