Skip to content

Commit aabca60

Browse files
miykaelmiykael
committed
FIX: new try on LD_LIBRARY_PATH
1 parent 9700824 commit aabca60

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by Neurodocker version 0.4.1-22-g7c44e01
2-
# Timestamp: 2018-10-10 18:29:21 UTC
2+
# Timestamp: 2018-10-10 18:42:03 UTC
33
#
44
# Thank you for using Neurodocker. If you discover any issues
55
# or ways to improve this software, please submit an issue or
@@ -97,6 +97,8 @@ RUN apt-get update -qq \
9797
&& /opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 quit \
9898
&& sed -i '$iexport SPMMCRCMD=\"/opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 script\"' $ND_ENTRYPOINT
9999

100+
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
101+
100102
RUN useradd --no-user-group --create-home --shell /bin/bash neuro
101103
USER neuro
102104

@@ -166,8 +168,6 @@ RUN chown -R neuro /home/neuro/nipype_tutorial
166168

167169
RUN rm -rf /opt/conda/pkgs/*
168170

169-
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
170-
171171
USER neuro
172172

173173
RUN mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py
@@ -216,6 +216,12 @@ RUN echo '{ \
216216
\n } \
217217
\n ], \
218218
\n [ \
219+
\n "env", \
220+
\n { \
221+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH" \
222+
\n } \
223+
\n ], \
224+
\n [ \
219225
\n "user", \
220226
\n "neuro" \
221227
\n ], \
@@ -303,12 +309,6 @@ RUN echo '{ \
303309
\n "rm -rf /opt/conda/pkgs/*" \
304310
\n ], \
305311
\n [ \
306-
\n "env", \
307-
\n { \
308-
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH" \
309-
\n } \
310-
\n ], \
311-
\n [ \
312312
\n "user", \
313313
\n "neuro" \
314314
\n ], \

‎Singularity

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Generated by Neurodocker version 0.4.1-22-g7c44e01
2-
# Timestamp: 2018-10-10 18:29:22 UTC
2+
# Timestamp: 2018-10-10 18:42:04 UTC
33
#
44
# Thank you for using Neurodocker. If you discover any issues
55
# or ways to improve this software, please submit an issue or
@@ -208,6 +208,12 @@ echo '{
208208
\n }
209209
\n ],
210210
\n [
211+
\n "env",
212+
\n {
213+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
214+
\n }
215+
\n ],
216+
\n [
211217
\n "user",
212218
\n "neuro"
213219
\n ],
@@ -295,12 +301,6 @@ echo '{
295301
\n "rm -rf /opt/conda/pkgs/*"
296302
\n ],
297303
\n [
298-
\n "env",
299-
\n {
300-
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
301-
\n }
302-
\n ],
303-
\n [
304304
\n "user",
305305
\n "neuro"
306306
\n ],
@@ -322,9 +322,9 @@ export ND_ENTRYPOINT="/neurodocker/startup.sh"
322322
export FORCE_SPMMCR="1"
323323
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"
324324
export MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
325+
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
325326
export CONDA_DIR="/opt/miniconda-latest"
326327
export PATH="/opt/miniconda-latest/bin:$PATH"
327-
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH"
328328

329329
%files
330330
. /home/neuro/nipype_tutorial

‎generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ generate_docker() {
1212
tig git-annex-remote-rclone octave netbase \
1313
--add-to-entrypoint "source /etc/fsl/fsl.sh" \
1414
--spm12 version=r7219 \
15+
--env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
1516
--user=neuro \
1617
--miniconda miniconda_version="4.3.31" \
1718
conda_install="python=3.6 pytest jupyter jupyterlab jupyter_contrib_nbextensions
@@ -33,7 +34,6 @@ generate_docker() {
3334
--user=root \
3435
--run 'chown -R neuro /home/neuro/nipype_tutorial' \
3536
--run 'rm -rf /opt/conda/pkgs/*' \
36-
--env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
3737
--user=neuro \
3838
--run 'mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py' \
3939
--workdir /home/neuro/nipype_tutorial \
@@ -50,6 +50,7 @@ generate_singularity() {
5050
tig git-annex-remote-rclone octave netbase \
5151
--add-to-entrypoint "source /etc/fsl/fsl.sh" \
5252
--spm12 version=r7219 \
53+
--env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
5354
--user=neuro \
5455
--miniconda miniconda_version="4.3.31" \
5556
conda_install="python=3.6 pytest jupyter jupyterlab jupyter_contrib_nbextensions
@@ -71,7 +72,6 @@ generate_singularity() {
7172
--user=root \
7273
--run 'chown -R neuro /home/neuro/nipype_tutorial' \
7374
--run 'rm -rf /opt/conda/pkgs/*' \
74-
--env LD_LIBRARY_PATH='/opt/miniconda-latest/envs/neuro/lib:$LD_LIBRARY_PATH' \
7575
--user=neuro \
7676
--run 'mkdir -p ~/.jupyter && echo c.NotebookApp.ip = \"0.0.0.0\" > ~/.jupyter/jupyter_notebook_config.py' \
7777
--workdir /home/neuro/nipype_tutorial

0 commit comments

Comments
 (0)