WIP: revert ld_library_paths to restart with issue

miykael · miykael · commit 9537303ffafe · 2018-10-11T18:10:27.000-04:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Generated by Neurodocker version 0.4.1-22-g7c44e01
-# Timestamp: 2018-10-10 18:57:39 UTC
+# Timestamp: 2018-10-11 22:10:04 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
@@ -142,8 +142,6 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
     && sync \
     && sed -i '$isource activate neuro' $ND_ENTRYPOINT
 
-ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
-
 RUN bash -c 'source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main'
 
 USER root
@@ -252,12 +250,6 @@ RUN echo '{ \
     \n      } \
     \n    ], \
     \n    [ \
-    \n      "env", \
-    \n      { \
-    \n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH" \
-    \n      } \
-    \n    ], \
-    \n    [ \
     \n      "run_bash", \
     \n      "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
     \n    ], \
diff --git a/Singularity b/Singularity
@@ -1,5 +1,5 @@
 # Generated by Neurodocker version 0.4.1-22-g7c44e01
-# Timestamp: 2018-10-10 18:57:40 UTC
+# Timestamp: 2018-10-11 22:10:05 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
@@ -244,12 +244,6 @@ echo '{
 \n      }
 \n    ],
 \n    [
-\n      "env",
-\n      {
-\n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
-\n      }
-\n    ],
-\n    [
 \n      "run_bash",
 \n      "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main"
 \n    ],
@@ -324,7 +318,6 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmc
 export MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
 export CONDA_DIR="/opt/miniconda-latest"
 export PATH="/opt/miniconda-latest/bin:$PATH"
-export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
 
 %files
 . /home/neuro/nipype_tutorial
diff --git a/generate.sh b/generate.sh
@@ -21,7 +21,6 @@ generate_docker() {
                           nilearn datalad[full] nipy duecredit nbval" \
              create_env="neuro" \
              activate=True \
-           --env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
            --run-bash "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
            --user=root \
            --run 'mkdir /data && chmod 777 /data && chmod a+s /data' \
@@ -59,7 +58,6 @@ generate_singularity() {
                           nilearn datalad[full] nipy duecredit nbval" \
              create_env="neuro" \
              activate=True \
-           --env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
            --run-bash "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
            --user=root \
            --run 'mkdir /data && chmod 777 /data && chmod a+s /data' \
