From 55ef76898808b55fd33f9b4cc6dab3b81d03fbe1 Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@duplicati.com>
Date: Fri, 19 Jun 2026 10:01:59 +0200
Subject: [PATCH] Update rclone in Docker images

This PR pulls the rclone binary from the release page, instead of relying on the outdated version in Debian repos.

This fixes #6958
---
 ReleaseBuilder/Resources/Docker/Dockerfile    | 25 ++++++++++++++++++-
 .../Resources/Docker/Dockerfile-agent         | 25 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/ReleaseBuilder/Resources/Docker/Dockerfile b/ReleaseBuilder/Resources/Docker/Dockerfile
index e72b4e64f..756d6b9aa 100644
--- a/ReleaseBuilder/Resources/Docker/Dockerfile
+++ b/ReleaseBuilder/Resources/Docker/Dockerfile
@@ -1,7 +1,30 @@
 FROM debian:latest
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 RUN apt update -y && \
-    apt install -y libssl3t64 ca-certificates libicu76 libgssapi-krb5-2 rclone gnupg tini
+    apt install -y libssl3t64 ca-certificates libicu76 libgssapi-krb5-2 gnupg tini curl unzip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN case "${TARGETARCH}" in \
+        "amd64")  RCLONE_ARCH="amd64" ;; \
+        "arm64")  RCLONE_ARCH="arm64" ;; \
+        "arm") \
+            case "${TARGETVARIANT}" in \
+                "v6") RCLONE_ARCH="arm-v6" ;; \
+                "v7") RCLONE_ARCH="arm-v7" ;; \
+                *)    RCLONE_ARCH="arm" ;; \
+            esac ;; \
+        "386")    RCLONE_ARCH="386" ;; \
+        *)        RCLONE_ARCH="${TARGETARCH}" ;; \
+    esac && \
+    curl -fsSL "https://downloads.rclone.org/rclone-current-linux-${RCLONE_ARCH}.zip" -o /tmp/rclone.zip && \
+    unzip -q /tmp/rclone.zip -d /tmp && \
+    cp /tmp/rclone-*/rclone /usr/bin/rclone && \
+    chmod +x /usr/bin/rclone && \
+    rm -rf /tmp/rclone*
 
 ENTRYPOINT [ "/usr/bin/tini", "--", "/run-as-user.sh" ]
 
diff --git a/ReleaseBuilder/Resources/Docker/Dockerfile-agent b/ReleaseBuilder/Resources/Docker/Dockerfile-agent
index 215c08773..64595f084 100644
--- a/ReleaseBuilder/Resources/Docker/Dockerfile-agent
+++ b/ReleaseBuilder/Resources/Docker/Dockerfile-agent
@@ -1,7 +1,30 @@
 FROM debian:latest
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 RUN apt update -y && \
-    apt install -y libssl3t64 ca-certificates libicu76 rclone gnupg tini
+    apt install -y libssl3t64 ca-certificates libicu76 gnupg tini curl unzip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN case "${TARGETARCH}" in \
+        "amd64")  RCLONE_ARCH="amd64" ;; \
+        "arm64")  RCLONE_ARCH="arm64" ;; \
+        "arm") \
+            case "${TARGETVARIANT}" in \
+                "v6") RCLONE_ARCH="arm-v6" ;; \
+                "v7") RCLONE_ARCH="arm-v7" ;; \
+                *)    RCLONE_ARCH="arm" ;; \
+            esac ;; \
+        "386")    RCLONE_ARCH="386" ;; \
+        *)        RCLONE_ARCH="${TARGETARCH}" ;; \
+    esac && \
+    curl -fsSL "https://downloads.rclone.org/rclone-current-linux-${RCLONE_ARCH}.zip" -o /tmp/rclone.zip && \
+    unzip -q /tmp/rclone.zip -d /tmp && \
+    cp /tmp/rclone-*/rclone /usr/bin/rclone && \
+    chmod +x /usr/bin/rclone && \
+    rm -rf /tmp/rclone*
 
 ENTRYPOINT [ "/usr/bin/tini", "--", "/run-as-user.sh" ]