Merge pull request #843 from dmwm/patch-rse-info

patch for json serialisation for empty dirs

docker/rucio-daemons/Dockerfile

@@ -38,4 +38,7 @@ RUN mkdir -p /patch
 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
 ENTRYPOINT ["/cms-entrypoint.sh"]

docker/rucio-server/Dockerfile

@@ -30,4 +30,7 @@ RUN mkdir -p /patch
 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
+
 ENTRYPOINT ["/cms-entrypoint.sh"]

docker/rucio-ui/Dockerfile

@@ -22,10 +22,13 @@ RUN rm -f /etc/httpd/conf.d/welcome.conf /etc/httpd/conf.d/userdir.conf /etc/htt
 ENV RUCIO_CA_PATH="/cvmfs/grid.cern.ch/etc/grid-security/certificates"
 
 # 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 get-rse-info command for tapes
+ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/3.patch /patch/3.patch
+
 ADD docker/rucio-ui/cms-entrypoint.sh /
 ENTRYPOINT ["/cms-entrypoint.sh"]