Merge pull request #834 from dynamic-entropy/prod_overwrite_on_disk_p…

…atch

Patch overwrite on disk until rucio 35 upgrade

docker/rucio-daemons/Dockerfile

@@ -27,9 +27,11 @@ 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
+RUN mkdir -p /patch
 
-# Patch for auto approve plugin rucio/pull/6215
-#ADD https://github.com/rucio/rucio/pull/6215.patch /patch/6215.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.diff
 
 ENTRYPOINT ["/cms-entrypoint.sh"]