diff --git a/Dockerfile.base b/Dockerfile.base index 5d353d727c05c14e5ce37b8af7c33251ded73de4..ada1ee12a0bd26787ec8d7fc54bc4e6ea1b02637 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 42adef14246478d6c67e78be750b741e3beb022a..be695aec6b2cdf3186a3d5c0ff5cecd7523d56d8 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 ec5691d4adee1b949c10f1db6cd841fcdccc35fd..0000000000000000000000000000000000000000 --- 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