From c29c43c7693b1412a77c544cab09b5f93ebd475b Mon Sep 17 00:00:00 2001 From: Rahul Chauhan Date: Wed, 9 Oct 2024 02:28:28 +0200 Subject: [PATCH] Add patch for CMS token path calculations --- docker/rucio-daemons/Dockerfile | 13 +++---------- docker/rucio-server/Dockerfile | 8 ++++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile index b5aea41..1928b65 100644 --- a/docker/rucio-daemons/Dockerfile +++ b/docker/rucio-daemons/Dockerfile @@ -29,18 +29,11 @@ ADD docker/rucio-daemons/cms-entrypoint.sh / # Cannot make patch directory unless there are patches RUN mkdir -p /patch -# Patch for overwrite when only on disk in Rucio -# Required for additional checks that were introduced in the latest CMS FTS as a result of overwrite-when-only-on-disk implementation in FTS -# TODO: To be removed in Rucio 35 -# ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/6903.diff /patch/6903.patch - -# Patch for dst_file_report +# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch -ADD https://patch-diff.githubusercontent.com/raw/ericvaandering/rucio/pull/10.patch /patch/10.patch -# Patch for get-rse-info command for tapes -# Most probably not needed here at all, json serialisation should not be needed in daemons -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/3.patch /patch/3.patch +# Patch for directory scoped token support +ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch # To be removed once this PR is available in our rucio version ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7106.patch /patch/7106.patch diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile index e38c21a..0045f34 100644 --- a/docker/rucio-server/Dockerfile +++ b/docker/rucio-server/Dockerfile @@ -26,11 +26,11 @@ RUN /tmp/install_mail_templates.sh # Cannot make patch directory unless there are patches RUN mkdir -p /patch -# Patch for dst_file_report +# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch -ADD https://patch-diff.githubusercontent.com/raw/ericvaandering/rucio/pull/10.patch /patch/10.patch -# Patch for get-rse-info command for tapes -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/3.patch /patch/3.patch +# Patch for directory scoped token support +ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch + ENTRYPOINT ["/cms-entrypoint.sh"]