From ee6b2f40bdeef6b546b8c6abd210fafce272f0c9 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 14 Jul 2020 14:49:39 +0200
Subject: [PATCH] Fixed build: do not attempt to replace populated var
directory by a symlink. We don't need to link var to the build user home dir
anyway.
---
Docker/lofar-outputproc/Dockerfile.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Docker/lofar-outputproc/Dockerfile.tmpl b/Docker/lofar-outputproc/Dockerfile.tmpl
index ff74d417426..453da92c8cd 100644
--- a/Docker/lofar-outputproc/Dockerfile.tmpl
+++ b/Docker/lofar-outputproc/Dockerfile.tmpl
@@ -66,8 +66,8 @@ RUN apt-get update && apt-get install -y git cmake g++ gfortran bison flex autog
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && sed -i '29,31d' include/ApplCommon/PosixTime.h && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && make -j ${J} && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && make install && \
- bash -c "mkdir -p /home/${USER}/lofar/var/{log,run}" && \
- bash -c "ln -sfT /home/${USER}/lofar/var ${INSTALLDIR}/lofar/var" && \
+ bash -c "mkdir -p ${INSTALLDIR}/lofar/var/{log,run}" && \
+ bash -c "chmod a+rwx ${INSTALLDIR}/lofar/var/{log,run} && \
bash -c "strip ${INSTALLDIR}/lofar/{bin,sbin,lib64}/* || true" && \
bash -c "rm -rf ${INSTALLDIR}/lofar/{build,src}" && \
setcap cap_sys_nice,cap_sys_admin=ep ${INSTALLDIR}/lofar/bin/outputProc && \
--
GitLab