From f61a72e3a4483fc5f87c31a32f20f094b0d3ed92 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 19 Apr 2016 09:25:17 +0000
Subject: [PATCH] Task #8437: Pipeline already installs $LOFARROOT/var, so move
 it instead of creating it.

---
 Docker/lofar-pipeline/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docker/lofar-pipeline/Dockerfile.tmpl b/Docker/lofar-pipeline/Dockerfile.tmpl
index b17d117b796..81948dcf203 100644
--- a/Docker/lofar-pipeline/Dockerfile.tmpl
+++ b/Docker/lofar-pipeline/Dockerfile.tmpl
@@ -51,7 +51,7 @@ RUN sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y su
     cd ${INSTALLDIR}/lofar/build/gnu_opt && sed -i '29,31d' include/ApplCommon/PosixTime.h && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make -j ${J} && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make install && \
-    bash -c "mkdir -p /home/${USER}/lofar/var/{log,run}" && \
+    bash -c "mv ${INSTALLDIR}/lofar/var /home/${USER}/" && \
     bash -c "ln -sfT /home/${USER}/lofar/var ${INSTALLDIR}/lofar/var" && \
     bash -c "strip ${INSTALLDIR}/lofar/{bin,sbin,lib64}/* || true" && \
     bash -c "rm -rf ${INSTALLDIR}/lofar/{build,src}" && \
-- 
GitLab