From 2ec994431b99708ee1911c4dd58408ec8934e1c3 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 21 Mar 2025 15:09:12 +0100 Subject: [PATCH 1/3] feat: use our own fork of rclone --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c778bb53..cab8a777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ FROM golang:1.23.0-bookworm AS build -ARG RCLONE_VERSION=v1.65.2 -ARG RCLONE_ARCH=amd64 -ARG RCLONE_OS=linux +# ARG RCLONE_VERSION=v1.65.2 +# ARG RCLONE_ARCH=amd64 +# ARG RCLONE_OS=linux +ARG RCLONE_DOWNLOAD_URL="" COPY go.mod go.sum ./ COPY cmd/ ./cmd/ COPY pkg/ ./pkg/ RUN go build -o /csi-rclone cmd/csi-rclone-plugin/main.go RUN apt-get update && apt-get install -y unzip && \ - curl https://downloads.rclone.org/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-${RCLONE_OS}-${RCLONE_ARCH}.zip -o rclone.zip && \ + curl "${RCLONE_DOWNLOAD_URL}" -o rclone.zip && \ unzip rclone.zip -d /rclone-unzip && \ chmod a+x /rclone-unzip/*/rclone && \ mv /rclone-unzip/*/rclone / From e7bb402ec9a4fddfd0abeef4b72fb658e9a28287 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Fri, 21 Mar 2025 15:43:54 +0100 Subject: [PATCH 2/3] download URL --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cab8a777..bd2e7f7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,13 @@ FROM golang:1.23.0-bookworm AS build # ARG RCLONE_VERSION=v1.65.2 # ARG RCLONE_ARCH=amd64 # ARG RCLONE_OS=linux -ARG RCLONE_DOWNLOAD_URL="" +ARG RCLONE_DOWNLOAD_URL="https://github.com/SwissDataScienceCenter/rclone/releases/download/v1.65.2-exp-doi-zenodo/rclone-v1.65.3-exp-doi-zenodo-linux-amd64.zip" COPY go.mod go.sum ./ COPY cmd/ ./cmd/ COPY pkg/ ./pkg/ RUN go build -o /csi-rclone cmd/csi-rclone-plugin/main.go RUN apt-get update && apt-get install -y unzip && \ - curl "${RCLONE_DOWNLOAD_URL}" -o rclone.zip && \ + curl "${RCLONE_DOWNLOAD_URL}" -Lo rclone.zip && \ unzip rclone.zip -d /rclone-unzip && \ chmod a+x /rclone-unzip/*/rclone && \ mv /rclone-unzip/*/rclone / From 3784d6a691eae8e223842b8a7c346e0105805020 Mon Sep 17 00:00:00 2001 From: Flora Thiebaut Date: Mon, 24 Mar 2025 11:58:17 +0100 Subject: [PATCH 3/3] make it easy to build with custom rclone --- Dockerfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index bd2e7f7e..8bc25284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,23 @@ +ARG RCLONE_IMAGE_REPOSITORY="ghcr.io/swissdatasciencecenter/rclone" +ARG RCLONE_IMAGE_TAG="sha-316bdfc" +FROM ${RCLONE_IMAGE_REPOSITORY}:${RCLONE_IMAGE_TAG} AS rclone + FROM golang:1.23.0-bookworm AS build # ARG RCLONE_VERSION=v1.65.2 # ARG RCLONE_ARCH=amd64 # ARG RCLONE_OS=linux -ARG RCLONE_DOWNLOAD_URL="https://github.com/SwissDataScienceCenter/rclone/releases/download/v1.65.2-exp-doi-zenodo/rclone-v1.65.3-exp-doi-zenodo-linux-amd64.zip" +# ARG RCLONE_DOWNLOAD_URL="https://github.com/SwissDataScienceCenter/rclone/releases/download/v1.65.2-exp-doi-zenodo/rclone-v1.65.3-exp-doi-zenodo-a3-linux-amd64.zip" COPY go.mod go.sum ./ COPY cmd/ ./cmd/ COPY pkg/ ./pkg/ RUN go build -o /csi-rclone cmd/csi-rclone-plugin/main.go -RUN apt-get update && apt-get install -y unzip && \ - curl "${RCLONE_DOWNLOAD_URL}" -Lo rclone.zip && \ - unzip rclone.zip -d /rclone-unzip && \ - chmod a+x /rclone-unzip/*/rclone && \ - mv /rclone-unzip/*/rclone / +COPY --from=rclone /rclone /rclone +RUN chmod a+x /rclone +# RUN apt-get update && apt-get install -y unzip && \ +# curl "${RCLONE_DOWNLOAD_URL}" -Lo rclone.zip && \ +# unzip rclone.zip -d /rclone-unzip && \ +# chmod a+x /rclone-unzip/*/rclone && \ +# mv /rclone-unzip/*/rclone / FROM debian:bookworm-slim # NOTE: the rclone needs ca-certificates and fuse3 to successfully mount cloud storage