From 7ea9e2e3a54821a5003590698d2d47b014057664 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Tue, 31 Dec 2024 11:29:18 -0600 Subject: [PATCH] Remove patches from image --- docker/rucio-server/Dockerfile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile index 490cacf..4472925 100644 --- a/docker/rucio-server/Dockerfile +++ b/docker/rucio-server/Dockerfile @@ -23,16 +23,9 @@ ADD docker/rucio-server/cms-entrypoint.sh / ADD docker/rucio-server/install_mail_templates.sh /tmp/ RUN /tmp/install_mail_templates.sh -# Cannot make patch directory unless there are patches -RUN mkdir -p /patch - -# 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 - -# Patch for directory scoped token support -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch - -# Patch for deep flag -ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch +# Patches are now included via flux secrets. Please see: +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory) +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml +# And prod/int-rucio-daemons.yaml ENTRYPOINT ["/cms-entrypoint.sh"]