Merge pull request miykael#130 from miykael/clean_out_ld_library_issue

FIX: changes library for libgcc_s.so.1 import

Author: miykael

Diff for: Dockerfile

@@ -1,5 +1,5 @@
-# Generated by Neurodocker version 0.4.1-22-g7c44e01
-# Timestamp: 2018-10-10 14:43:05 UTC
+# Generated by Neurodocker version 0.4.2-dev
+# Timestamp: 2018-10-15 12:01:29 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
@@ -63,8 +63,6 @@ RUN apt-get update -qq \
 
 RUN sed -i '$isource /etc/fsl/fsl.sh' $ND_ENTRYPOINT
 
-ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
-
 ENV FORCE_SPMMCR="1" \
     LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmcr-2010a/v713/runtime/glnxa64:/opt/matlabmcr-2010a/v713/bin/glnxa64:/opt/matlabmcr-2010a/v713/sys/os/glnxa64:/opt/matlabmcr-2010a/v713/extern/bin/glnxa64" \
     MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
@@ -144,6 +142,8 @@ 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:/usr/lib/fsl/5.0"
+
 RUN bash -c 'source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main'
 
 USER root
@@ -210,12 +210,6 @@ RUN echo '{ \
     \n      "source /etc/fsl/fsl.sh" \
     \n    ], \
     \n    [ \
-    \n      "env", \
-    \n      { \
-    \n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH" \
-    \n      } \
-    \n    ], \
-    \n    [ \
     \n      "spm12", \
     \n      { \
     \n        "version": "r7219" \
@@ -258,6 +252,12 @@ RUN echo '{ \
     \n      } \
     \n    ], \
     \n    [ \
+    \n      "env", \
+    \n      { \
+    \n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0" \
+    \n      } \
+    \n    ], \
+    \n    [ \
     \n      "run_bash", \
     \n      "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
     \n    ], \

Diff for: Singularity

@@ -1,5 +1,5 @@
-# Generated by Neurodocker version 0.4.1-22-g7c44e01
-# Timestamp: 2018-10-10 14:43:07 UTC
+# Generated by Neurodocker version 0.4.2-dev
+# Timestamp: 2018-10-15 12:01:30 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
@@ -202,12 +202,6 @@ echo '{
 \n      "source /etc/fsl/fsl.sh"
 \n    ],
 \n    [
-\n      "env",
-\n      {
-\n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
-\n      }
-\n    ],
-\n    [
 \n      "spm12",
 \n      {
 \n        "version": "r7219"
@@ -250,6 +244,12 @@ echo '{
 \n      }
 \n    ],
 \n    [
+\n      "env",
+\n      {
+\n        "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
+\n      }
+\n    ],
+\n    [
 \n      "run_bash",
 \n      "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main"
 \n    ],
@@ -319,12 +319,12 @@ echo '{
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 export ND_ENTRYPOINT="/neurodocker/startup.sh"
-export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
 export FORCE_SPMMCR="1"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmcr-2010a/v713/runtime/glnxa64:/opt/matlabmcr-2010a/v713/bin/glnxa64:/opt/matlabmcr-2010a/v713/sys/os/glnxa64:/opt/matlabmcr-2010a/v713/extern/bin/glnxa64"
 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:/usr/lib/fsl/5.0"
 
 %files
 . /home/neuro/nipype_tutorial

Diff for: generate.sh

@@ -11,7 +11,6 @@ generate_docker() {
                      git-annex-standalone vim emacs-nox nano less ncdu \
                      tig git-annex-remote-rclone octave netbase \
            --add-to-entrypoint "source /etc/fsl/fsl.sh" \
-           --env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
            --spm12 version=r7219 \
            --user=neuro \
            --miniconda miniconda_version="4.3.31" \
@@ -22,6 +21,7 @@ generate_docker() {
                           nilearn datalad[full] nipy duecredit nbval" \
              create_env="neuro" \
              activate=True \
+           --env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$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' \
@@ -49,7 +49,6 @@ generate_singularity() {
                      git-annex-standalone vim emacs-nox nano less ncdu \
                      tig git-annex-remote-rclone octave netbase \
            --add-to-entrypoint "source /etc/fsl/fsl.sh" \
-           --env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
            --spm12 version=r7219 \
            --user=neuro \
            --miniconda miniconda_version="4.3.31" \
@@ -60,6 +59,7 @@ generate_singularity() {
                           nilearn datalad[full] nipy duecredit nbval" \
              create_env="neuro" \
              activate=True \
+           --env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$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' \