From 52ccf7c3a35a52882a1b1cdb53274339715ce623 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 6 Apr 2016 17:16:33 +0000
Subject: [PATCH] Task #8437: Move bashrc to /opt, and include and propagate it
to user-specified command
---
Docker/lofar-base/Dockerfile.tmpl | 2 +-
Docker/lofar-base/bashrc | 1 +
Docker/lofar-base/chuser.sh | 8 +++++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Docker/lofar-base/Dockerfile.tmpl b/Docker/lofar-base/Dockerfile.tmpl
index af8599032ca..96b70375c3b 100644
--- a/Docker/lofar-base/Dockerfile.tmpl
+++ b/Docker/lofar-base/Dockerfile.tmpl
@@ -164,7 +164,7 @@ RUN sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y gi
#
# config
#
-COPY bashrc /home/${USER}/.bashrc
+COPY bashrc /opt/bashrc
#
# entry
diff --git a/Docker/lofar-base/bashrc b/Docker/lofar-base/bashrc
index 74dbbeef125..0a421af1a7d 100644
--- a/Docker/lofar-base/bashrc
+++ b/Docker/lofar-base/bashrc
@@ -2,6 +2,7 @@
# lofar
[ -r ${INSTALLDIR}/lofar/lofarinit.sh ] && source ${INSTALLDIR}/lofar/lofarinit.sh
+export PATH PYTHONPATH LD_LIBRARY_PATH LOFARROOT
# qpid
source ${INSTALLDIR}/qpid/.profile
diff --git a/Docker/lofar-base/chuser.sh b/Docker/lofar-base/chuser.sh
index 0b034ddec1a..3c4e9d3ab0f 100755
--- a/Docker/lofar-base/chuser.sh
+++ b/Docker/lofar-base/chuser.sh
@@ -23,8 +23,10 @@ fi
# Update environment for updated user
export HOME=/home/${USER}
-touch -a $HOME/.bashrc
-source $HOME/.bashrc
+
+# Import bashrc for software in /opt
+source /opt/bashrc
# Use exec to make sure we propagate signals
-exec sudo -u ${USER} -E "$@"
+# `env' is needed to propagate PATH variables through sudo.
+exec sudo -u ${USER} -E env "PATH=$PATH" "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" "PYTHONPATH=$PYTHONPATH" "$@"
--
GitLab