Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3ce8c10

Browse files
committed
updating python and adding niflow.nipype1 to the requirements
1 parent2d148d0 commit3ce8c10

File tree

3 files changed

+76
-65
lines changed

3 files changed

+76
-65
lines changed

‎Dockerfile

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Generated by Neurodocker version 0.5.0
2-
# Timestamp: 2019-07-14 08:54:07 UTC
1+
# Your version: 0.6.0+5.g74cb187.dirty Latest version: 0.7.0
2+
# Generated by Neurodocker version 0.6.0+5.g74cb187.dirty
3+
# Timestamp: 2020-08-05 04:01:42 UTC
34
#
45
# Thank you for using Neurodocker. If you discover any issues
56
# or ways to improve this software, please submit an issue or
@@ -9,6 +10,8 @@
910

1011
FROM neurodebian:stretch-non-free
1112

13+
USER root
14+
1215
ARG DEBIAN_FRONTEND="noninteractive"
1316

1417
ENV LANG="en_US.UTF-8" \
@@ -91,12 +94,12 @@ RUN export TMPDIR="$(mktemp -d)" \
9194
&& rm -rf"$TMPDIR" \
9295
&& unset TMPDIR \
9396
&& echo"Downloading standalone SPM ..." \
94-
&& curl -fsSL --retry 5 -o /tmp/spm12.ziphttp://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/previous/spm12_r7219_R2010a.zip \
97+
&& curl -fsSL --retry 5 -o /tmp/spm12.ziphttps://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/previous/spm12_r7219_R2010a.zip \
9598
&& unzip -q /tmp/spm12.zip -d /tmp \
9699
&& mkdir -p /opt/spm12-r7219 \
97100
&& mv /tmp/spm12/* /opt/spm12-r7219/ \
98101
&& chmod -R 777 /opt/spm12-r7219 \
99-
&& rm -rf /tmp/* \
102+
&& rm -rf /tmp/spm* \
100103
&& /opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 quit \
101104
&& sed -i'$iexport SPMMCRCMD=\"/opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 script\"' $ND_ENTRYPOINT
102105

@@ -120,35 +123,35 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
120123
&& sync && conda clean --all && sync \
121124
&& conda create -y -q --name neuro \
122125
&& conda install -y -q --name neuro \
123-
'python=3.6' \
124-
'pytest' \
125-
'jupyter' \
126-
'jupyterlab' \
127-
'jupyter_contrib_nbextensions' \
128-
'traits' \
129-
'pandas' \
130-
'matplotlib' \
131-
'scikit-learn' \
132-
'scikit-image' \
133-
'seaborn' \
134-
'nbformat' \
135-
'nb_conda' \
126+
"python=3.7" \
127+
"pytest" \
128+
"jupyter" \
129+
"jupyterlab" \
130+
"jupyter_contrib_nbextensions" \
131+
"traits" \
132+
"pandas" \
133+
"matplotlib" \
134+
"scikit-learn" \
135+
"scikit-image" \
136+
"seaborn" \
137+
"nbformat" \
138+
"nb_conda" \
136139
&& sync && conda clean --all && sync \
137140
&& bash -c"source activate neuro \
138141
&& pip install --no-cache-dir \
139-
https://github.com/nipy/nipype/tarball/master \
140-
https://github.com/INCF/pybids/tarball/0.7.1 \
141-
niflow-nipype1-workflows \
142-
nilearn \
143-
datalad[full] \
144-
nipy \
145-
duecredit \
146-
nbval" \
142+
"https://github.com/nipy/nipype/tarball/master" \
143+
"https://github.com/INCF/pybids/tarball/0.7.1" \
144+
"nilearn" \
145+
"datalad[full]" \
146+
"nipy" \
147+
"duecredit" \
148+
"nbval" \
149+
"niflow-nipype1-workflows"" \
147150
&& rm -rf ~/.cache/pip/* \
148151
&& sync \
149152
&& sed -i'$isource activate neuro' $ND_ENTRYPOINT
150153

151-
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
154+
ENV LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:"
152155

153156
RUN bash -c'source activate neuro && jupyter nbextension enable exercise2/main && jupyter nbextension enable spellchecker/main'
154157

@@ -232,9 +235,8 @@ RUN echo '{ \
232235
\n [ \
233236
\n "miniconda", \
234237
\n { \
235-
\n "miniconda_version": "4.3.31", \
236238
\n "conda_install": [ \
237-
\n "python=3.6", \
239+
\n "python=3.7", \
238240
\n "pytest", \
239241
\n "jupyter", \
240242
\n "jupyterlab", \
@@ -255,7 +257,8 @@ RUN echo '{ \
255257
\n "datalad[full]", \
256258
\n "nipy", \
257259
\n "duecredit", \
258-
\n "nbval" \
260+
\n "nbval", \
261+
\n "niflow-nipype1-workflows" \
259262
\n ], \
260263
\n "create_env": "neuro", \
261264
\n "activate": true \
@@ -264,7 +267,7 @@ RUN echo '{ \
264267
\n [ \
265268
\n "env", \
266269
\n { \
267-
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0" \
270+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:" \
268271
\n } \
269272
\n ], \
270273
\n [ \

‎Singularity

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Generated by Neurodocker version 0.5.0
2-
# Timestamp: 2019-07-14 08:54:09 UTC
1+
# Your version: 0.6.0+5.g74cb187.dirty Latest version: 0.7.0
2+
# Generated by Neurodocker version 0.6.0+5.g74cb187.dirty
3+
# Timestamp: 2020-08-05 04:01:43 UTC
34
#
45
# Thank you for using Neurodocker. If you discover any issues
56
# or ways to improve this software, please submit an issue or
@@ -11,6 +12,8 @@ Bootstrap: docker
1112
From: neurodebian:stretch-non-free
1213

1314
%post
15+
su - root
16+
1417
export ND_ENTRYPOINT="/neurodocker/startup.sh"
1518
apt-get update -qq
1619
apt-get install -y -q --no-install-recommends \
@@ -83,12 +86,12 @@ chmod +x "$TMPDIR/MCRInstaller.bin"
8386
rm -rf"$TMPDIR"
8487
unset TMPDIR
8588
echo"Downloading standalone SPM ..."
86-
curl -fsSL --retry 5 -o /tmp/spm12.ziphttp://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/previous/spm12_r7219_R2010a.zip
89+
curl -fsSL --retry 5 -o /tmp/spm12.ziphttps://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/previous/spm12_r7219_R2010a.zip
8790
unzip -q /tmp/spm12.zip -d /tmp
8891
mkdir -p /opt/spm12-r7219
8992
mv /tmp/spm12/* /opt/spm12-r7219/
9093
chmod -R 777 /opt/spm12-r7219
91-
rm -rf /tmp/*
94+
rm -rf /tmp/spm*
9295
/opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 quit
9396
sed -i'$iexport SPMMCRCMD=\"/opt/spm12-r7219/run_spm12.sh /opt/matlabmcr-2010a/v713 script\"'$ND_ENTRYPOINT
9497

@@ -110,29 +113,30 @@ conda config --system --set show_channel_urls true
110113
sync && conda clean --all && sync
111114
conda create -y -q --name neuro
112115
conda install -y -q --name neuro \
113-
'python=3.6' \
114-
'pytest' \
115-
'jupyter' \
116-
'jupyterlab' \
117-
'jupyter_contrib_nbextensions' \
118-
'traits' \
119-
'pandas' \
120-
'matplotlib' \
121-
'scikit-learn' \
122-
'scikit-image' \
123-
'seaborn' \
124-
'nbformat' \
125-
'nb_conda'
116+
"python=3.7" \
117+
"pytest" \
118+
"jupyter" \
119+
"jupyterlab" \
120+
"jupyter_contrib_nbextensions" \
121+
"traits" \
122+
"pandas" \
123+
"matplotlib" \
124+
"scikit-learn" \
125+
"scikit-image" \
126+
"seaborn" \
127+
"nbformat" \
128+
"nb_conda"
126129
sync && conda clean --all && sync
127130
bash -c"source activate neuro
128131
pip install --no-cache-dir\
129-
https://github.com/nipy/nipype/tarball/master\
130-
https://github.com/INCF/pybids/tarball/0.7.1\
131-
nilearn\
132-
datalad[full]\
133-
nipy\
134-
duecredit\
135-
nbval"
132+
"https://github.com/nipy/nipype/tarball/master"\
133+
"https://github.com/INCF/pybids/tarball/0.7.1"\
134+
"nilearn"\
135+
"datalad[full]"\
136+
"nipy"\
137+
"duecredit"\
138+
"nbval"\
139+
"niflow-nipype1-workflows""
136140
rm -rf ~/.cache/pip/*
137141
sync
138142
sed -i'$isource activate neuro'$ND_ENTRYPOINT
@@ -174,6 +178,10 @@ echo '{
174178
\n "neurodebian:stretch-non-free"
175179
\n ],
176180
\n [
181+
\n "user",
182+
\n "root"
183+
\n ],
184+
\n [
177185
\n "_header",
178186
\n {
179187
\n "version": "generic",
@@ -223,9 +231,8 @@ echo '{
223231
\n [
224232
\n "miniconda",
225233
\n {
226-
\n "miniconda_version": "4.3.31",
227234
\n "conda_install": [
228-
\n "python=3.6",
235+
\n "python=3.7",
229236
\n "pytest",
230237
\n "jupyter",
231238
\n "jupyterlab",
@@ -246,7 +253,8 @@ echo '{
246253
\n "datalad[full]",
247254
\n "nipy",
248255
\n "duecredit",
249-
\n "nbval"
256+
\n "nbval",
257+
\n "niflow-nipype1-workflows"
250258
\n ],
251259
\n "create_env": "neuro",
252260
\n "activate": true
@@ -255,7 +263,7 @@ echo '{
255263
\n [
256264
\n "env",
257265
\n {
258-
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
266+
\n "LD_LIBRARY_PATH": "/opt/miniconda-latest/envs/neuro:"
259267
\n }
260268
\n ],
261269
\n [
@@ -333,7 +341,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu:/opt/matlabmc
333341
export MATLABCMD="/opt/matlabmcr-2010a/v713/toolbox/matlab"
334342
export CONDA_DIR="/opt/miniconda-latest"
335343
export PATH="/opt/miniconda-latest/bin:$PATH"
336-
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:/usr/lib/fsl/5.0"
344+
export LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:"
337345

338346
%files
339347
. /home/neuro/nipype_tutorial

‎generate.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ generate_docker() {
1414
--spm12 version=r7219 \
1515
--user=neuro \
1616
--workdir /home/neuro \
17-
--minicondaminiconda_version="4.3.31"\
18-
conda_install="python=3.6 pytest jupyter jupyterlab jupyter_contrib_nbextensions
17+
--miniconda \
18+
conda_install="python=3.7 pytest jupyter jupyterlab jupyter_contrib_nbextensions
1919
traits pandas matplotlib scikit-learn scikit-image seaborn nbformat nb_conda" \
2020
pip_install="https://github.com/nipy/nipype/tarball/master
2121
https://github.com/INCF/pybids/tarball/0.7.1
22-
nilearn datalad[full] nipy duecredit nbval" \
22+
nilearn datalad[full] nipy duecredit nbval niflow-nipype1-workflows" \
2323
create_env="neuro" \
2424
activate=True \
2525
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$LD_LIBRARY_PATH" \
@@ -53,12 +53,12 @@ generate_singularity() {
5353
--spm12 version=r7219 \
5454
--user=neuro \
5555
--workdir /home/neuro \
56-
--minicondaminiconda_version="4.3.31"\
57-
conda_install="python=3.6 pytest jupyter jupyterlab jupyter_contrib_nbextensions
56+
--miniconda \
57+
conda_install="python=3.7 pytest jupyter jupyterlab jupyter_contrib_nbextensions
5858
traits pandas matplotlib scikit-learn scikit-image seaborn nbformat nb_conda" \
5959
pip_install="https://github.com/nipy/nipype/tarball/master
6060
https://github.com/INCF/pybids/tarball/0.7.1
61-
nilearn datalad[full] nipy duecredit nbval" \
61+
nilearn datalad[full] nipy duecredit nbval niflow-nipype1-workflows" \
6262
create_env="neuro" \
6363
activate=True \
6464
--env LD_LIBRARY_PATH="/opt/miniconda-latest/envs/neuro:$LD_LIBRARY_PATH" \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp