Skip to content

Commit 2213b24

Browse files
committed
FIX: update spm and miniconda syntax for neurodocker cmd
1 parent 0c55634 commit 2213b24

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

docker/generate_dockerfiles.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,15 @@ function generate_base_dockerfile() {
6767
docker run --rm "$NEURODOCKER_IMAGE" generate docker \
6868
--base "$BASE_IMAGE" --pkg-manager "$PKG_MANAGER" \
6969
--label maintainer="The nipype developers https://github.com/nipy/nipype" \
70-
--spm version=12 matlab_version=R2017a \
70+
--spm12 version=r7219 \
7171
--afni version=latest install_python2=true \
7272
--freesurfer version=6.0.0 min=true \
7373
--run 'echo "cHJpbnRmICJrcnp5c3p0b2YuZ29yZ29sZXdza2lAZ21haWwuY29tXG41MTcyXG4gKkN2dW12RVYzelRmZ1xuRlM1Si8yYzFhZ2c0RVxuIiA+IC9vcHQvZnJlZXN1cmZlci9saWNlbnNlLnR4dAo=" | base64 -d | sh' \
7474
--install ants apt-utils bzip2 convert3d file fsl-core fsl-mni152-templates \
7575
fusefat g++ git graphviz make ruby unzip xvfb \
7676
--add-to-entrypoint "source /etc/fsl/fsl.sh" \
7777
--env ANTSPATH='/usr/lib/ants' PATH='/usr/lib/ants:$PATH' \
78-
--run "gem install fakes3" \
79-
--no-check-urls > "$DIR/Dockerfile.base"
78+
--run "gem install fakes3" > "$DIR/Dockerfile.base"
8079
}
8180

8281

@@ -86,7 +85,7 @@ function generate_main_dockerfile() {
8685
--label maintainer="The nipype developers https://github.com/nipy/nipype" \
8786
--env MKL_NUM_THREADS=1 OMP_NUM_THREADS=1 \
8887
--user neuro \
89-
--miniconda env_name=neuro \
88+
--miniconda create_env=neuro \
9089
activate=true \
9190
--copy docker/files/run_builddocs.sh docker/files/run_examples.sh \
9291
docker/files/run_pytests.sh nipype/external/fsl_imglob.py /usr/bin/ \
@@ -100,13 +99,13 @@ function generate_main_dockerfile() {
10099
&& chown neuro /work' \
101100
--user neuro \
102101
--arg PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=6 BUILD_DATE VCS_REF VERSION \
103-
--miniconda env_name=neuro \
102+
--miniconda create_env=neuro \
104103
conda_install='python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
105104
icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko
106105
pandas psutil scikit-learn scipy traits=4.6.0' \
107106
pip_opts="-e" \
108107
pip_install="/src/nipype[all]" \
109-
--miniconda env_name=neuro \
108+
--miniconda create_env=neuro \
110109
pip_install="grabbit==0.1.2" \
111110
--run-bash "mkdir -p /src/pybids
112111
&& curl -sSL --retry 5 https://github.com/INCF/pybids/tarball/0.6.5
@@ -121,8 +120,7 @@ function generate_main_dockerfile() {
121120
org.label-schema.vcs-ref='$VCS_REF' \
122121
org.label-schema.vcs-url="https://github.com/nipy/nipype" \
123122
org.label-schema.version='$VERSION' \
124-
org.label-schema.schema-version="1.0" \
125-
--no-check-urls
123+
org.label-schema.schema-version="1.0"
126124
}
127125

128126

0 commit comments

Comments
 (0)