Dockerfile: fixing /var/run/xrootd and /var/spool/xrootd

BristolComputing · Nov 23, 2021 · 31210aa · 31210aa
1 parent 164040e
commit 31210aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -86,6 +86,10 @@ ENV JAVA_HOME=/etc/alternatives/jre
 ENV LD_LIBRARY_PATH=/opt/hadoop/lib/native:/etc/alternatives/jre/lib/amd64/server
 ENV CLASSPATH=/etc/hadoop/conf.cloudera.hdfs:/opt/hadoop/share/hadoop/client/*:/opt/hadoop/share/hadoop/common/lib/*:/opt/hadoop/share/hadoop/common/*:/opt/hadoop/share/hadoop/hdfs:/opt/hadoop/share/hadoop/hdfs/lib/*:/opt/hadoop/share/hadoop/hdfs/*:/opt/hadoop/share/hadoop/mapreduce/*:/opt/hadoop/share/hadoop/yarn:/opt/hadoop/share/hadoop/yarn/lib/*:/opt/hadoop/share/hadoop/yarn/*
 
+# xrootd folder fixes
+RUN mkdir -p /var/run/xrootd /var/spool/xrootd \
+  && chown xrootd:xrootd /var/run/xrootd /var/spool/xrootd
+
 VOLUME /xrootd
 
 COPY etc/supervisord.conf /etc/supervisord.conf

diff --git a/etc/systemd/system/docker.xrootdgateway.service b/etc/systemd/system/docker.xrootdgateway.service
@@ -11,7 +11,6 @@ ExecStartPre=-/usr/bin/docker kill xrootd-se
 ExecStart=/usr/bin/docker run --rm --name %n \
     --hostname=xrootdsefqdn \
     -v /var/log/xrootd:/var/log/xrootd \
-    -v /var/run/xrootd:/var/run/xrootd \
     -v /opt/xrootd-se/etc/xrootd:/etc/xrootd:ro \
     -v /opt/xrootd-se/etc/supervisord.d:/etc/supervisord.d:ro \
     -v /opt/xrootd-se/.secrets/prod:/.secrets:ro \

diff --git a/etc/systemd/system/docker.xrootdse.service b/etc/systemd/system/docker.xrootdse.service
@@ -11,7 +11,6 @@ ExecStartPre=-/usr/bin/docker kill xrootd-se
 ExecStart=/usr/bin/docker run --rm --name %n \
     --hostname=xrootdsefqdn \
     -v /var/log/xrootd:/var/log/xrootd \
-    -v /var/run/xrootd:/var/run/xrootd \
     -v /opt/xrootd-se/etc/xrootd:/etc/xrootd:ro \
     -v /opt/xrootd-se/etc/supervisord.d:/etc/supervisord.d:ro \
     -v /opt/xrootd-se/.secrets/prod:/.secrets:ro \