Remove patches only from daemons

dmwm · Dec 31, 2024 · 5be8c29 · 5be8c29
1 parent 7ea9e2e
commit 5be8c29
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile
@@ -26,16 +26,9 @@ RUN rmdir /etc/grid-security/certificates && ln -s /cvmfs/grid.cern.ch/etc/grid-
 
 ADD docker/rucio-daemons/cms-entrypoint.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"]
diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile
@@ -23,9 +23,16 @@ ADD docker/rucio-server/cms-entrypoint.sh /
 ADD docker/rucio-server/install_mail_templates.sh /tmp/
 RUN /tmp/install_mail_templates.sh
 
-# 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
+# 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
 
 ENTRYPOINT ["/cms-entrypoint.sh"]