From 165bf72c8af07490b057ff5890e01a51daf34d56 Mon Sep 17 00:00:00 2001
From: Giuliano Taffoni <giuliano.taffoni@inaf.it>
Date: Thu, 4 Mar 2021 15:49:15 +0100
Subject: [PATCH] Add home based casa and python configurations
---
Dockerfile.base | 10 ++++------
build-base.sh | 7 ++++---
files/init.py | 5 -----
3 files changed, 8 insertions(+), 14 deletions(-)
delete mode 100644 files/init.py
diff --git a/Dockerfile.base b/Dockerfile.base
index 5d353d7..ada1ee1 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -37,12 +37,10 @@ RUN useradd metauser -d /home/metauser -u 65527 -g 65527 -m -s /bin/bash
# Add metuaser user to sudoers
RUN echo "metauser ALL=(ALL)NOPASSWD: ALL" >> /etc/sudoers
-# update PATH
-RUN echo "PATH=${CASABIN}:\$PATH" >> /home/metauser/.bash_profile
-RUN mkdir /home/metauser/.casa
-COPY files/init.py /home/metauser/.casa
-COPY files/analysis_scripts_sing.tgz /home/metauser/
-RUN cd /home/metauser && tar zxvf /home/metauser/analysis_scripts_sing.tgz
+# update PATH and add CASA configurations
+COPY files/metahome.tar.gz /home/
+RUN cd /home/metauser && tar zxvf /home/metahome.tar.gz && rm -f /home/metahome.tar.gz
+RUN chown -R metauser.metagroup /home/metauser
# Prepare to make a clean enviroment to share with SINGULARITY
RUN mv /home/metauser /metauser_home_vanilla
RUN chmod 777 /metauser_home_vanilla
diff --git a/build-base.sh b/build-base.sh
index 42adef1..be695ae 100644
--- a/build-base.sh
+++ b/build-base.sh
@@ -1,7 +1,8 @@
#!/bin/bash
-if [ "x$TAG" == "x"]; then
- TAG=latest
-if
+if [ "x$TAG" == "x" ]; then
+ TAG="latest"
+fi
docker build -t morgan1971/almagal:$TAG -f Dockerfile.base .
+
diff --git a/files/init.py b/files/init.py
deleted file mode 100644
index ec5691d..0000000
--- a/files/init.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import sys
-sys.path.append("/usr/lib/python2.7/site-packages")
-sys.path.append("/usr/lib64/python2.7/site-packages")
-sys.path.append("/home/metauser/analysis_scripts/")
-import analysisUtils as aU
--
GitLab