Skip to content

Commit 0856b7b

Browse files
committed
FIX: update generate_main_dockerfile to new miniconda specification
1 parent 2213b24 commit 0856b7b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

docker/generate_dockerfiles.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ function generate_main_dockerfile() {
8686
--env MKL_NUM_THREADS=1 OMP_NUM_THREADS=1 \
8787
--user neuro \
8888
--miniconda create_env=neuro \
89+
conda_install='python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}' \
8990
activate=true \
9091
--copy docker/files/run_builddocs.sh docker/files/run_examples.sh \
9192
docker/files/run_pytests.sh nipype/external/fsl_imglob.py /usr/bin/ \
@@ -99,13 +100,12 @@ function generate_main_dockerfile() {
99100
&& chown neuro /work' \
100101
--user neuro \
101102
--arg PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=6 BUILD_DATE VCS_REF VERSION \
102-
--miniconda create_env=neuro \
103-
conda_install='python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
104-
icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko
103+
--miniconda use_env=neuro \
104+
conda_install='icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko
105105
pandas psutil scikit-learn scipy traits=4.6.0' \
106106
pip_opts="-e" \
107107
pip_install="/src/nipype[all]" \
108-
--miniconda create_env=neuro \
108+
--miniconda use_env=neuro \
109109
pip_install="grabbit==0.1.2" \
110110
--run-bash "mkdir -p /src/pybids
111111
&& curl -sSL --retry 5 https://github.com/INCF/pybids/tarball/0.6.5

0 commit comments

Comments
 (0)