Skip to content

Commit e49ca8c

Browse files
committed
ENH: add miniconda's neuro env library path
1 parent 34a600b commit e49ca8c

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

Diff for: Dockerfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Generated by Neurodocker version 0.4.1-22-g7c44e01
2-
# Timestamp: 2018-10-11 22:11:11 UTC
1+
# Generated by Neurodocker version 0.4.2-dev
2+
# Timestamp: 2018-10-15 12:01:29 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
@@ -142,6 +142,8 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
142142
&& sync \
143143
&& sed -i '$isource activate neuro' $ND_ENTRYPOINT
144144

145+
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
146+
145147
RUN bash -c 'source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main'
146148

147149
USER root
@@ -250,6 +252,12 @@ RUN echo '{ \
250252
\n } \
251253
\n ], \
252254
\n [ \
255+
\n "env", \
256+
\n { \
257+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0" \
258+
\n } \
259+
\n ], \
260+
\n [ \
253261
\n "run_bash", \
254262
\n "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
255263
\n ], \

Diff for: Singularity

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Generated by Neurodocker version 0.4.1-22-g7c44e01
2-
# Timestamp: 2018-10-11 22:11:12 UTC
1+
# Generated by Neurodocker version 0.4.2-dev
2+
# Timestamp: 2018-10-15 12:01:30 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
@@ -244,6 +244,12 @@ echo '{
244244
\n }
245245
\n ],
246246
\n [
247+
\n "env",
248+
\n {
249+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
250+
\n }
251+
\n ],
252+
\n [
247253
\n "run_bash",
248254
\n "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main"
249255
\n ],
@@ -318,6 +324,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmc
318324
export MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
319325
export CONDA_DIR="/opt/miniconda-latest"
320326
export PATH="/opt/miniconda-latest/bin:$PATH"
327+
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
321328

322329
%files
323330
. /home/neuro/nipype_tutorial

Diff for: generate.sh

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ generate_docker() {
2121
nilearn datalad[full] nipy duecredit nbval" \
2222
create_env="neuro" \
2323
activate=True \
24+
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$LD_LIBRARY_PATH" \
2425
--run-bash "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
2526
--user=root \
2627
--run 'mkdir /data && chmod 777 /data && chmod a+s /data' \
@@ -58,6 +59,7 @@ generate_singularity() {
5859
nilearn datalad[full] nipy duecredit nbval" \
5960
create_env="neuro" \
6061
activate=True \
62+
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$LD_LIBRARY_PATH" \
6163
--run-bash "source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main" \
6264
--user=root \
6365
--run 'mkdir /data && chmod 777 /data && chmod a+s /data' \

0 commit comments

Comments
 (0)