Skip to content

Commit fb5edf0

Browse files
committed
first building version of Dockerfile, fixes in Dockerfiles for tests with python<3.5
1 parent 33b47ef commit fb5edf0

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ ENV PATH=/usr/local/miniconda/bin:$PATH \
167167
ACCEPT_INTEL_PYTHON_EULA=yes
168168

169169
# Installing precomputed python packages
170-
RUN conda config --add channels intel conda-forge && \
170+
RUN conda config --add channels intel --add channels conda-forge && \
171171
conda config --set always_yes yes --set changeps1 no && \
172172
conda update -q conda && \
173173
conda install -y mkl=2017.0.1 \
@@ -181,11 +181,10 @@ RUN conda config --add channels intel conda-forge && \
181181
traits=4.6.0 \
182182
psutil=5.0.1 \
183183
icu=58.1 && \
184-
chmod +x /usr/local/miniconda/bin/* && \
185-
conda clean --all -y
184+
chmod +x /usr/local/miniconda/bin/*
186185

187186
# matplotlib cleanups: set default backend, precaching fonts
188-
RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc && \
187+
RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python3.5/site-packages/matplotlib/mpl-data/matplotlibrc && \
189188
python -c "from matplotlib import font_manager"
190189

191190
# Unless otherwise specified each process should only use one thread - nipype

docker/Dockerfile_py27

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ RUN conda install python=2.7 && \
3636
COPY docker/files/run_* /usr/bin/
3737
RUN chmod +x /usr/bin/run_*
3838

39+
# matplotlib cleanups: set default backend, precaching fonts
40+
RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc && \
41+
python -c "from matplotlib import font_manager"
42+
3943
# Re-install nipype
4044
COPY . /root/src/nipype
4145
RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \

docker/Dockerfile_py34

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ RUN rm -r ${FSLDIR}/bin/imglob && \
4242
chmod +x /usr/bin/fsl_imglob.py && \
4343
ln -s /usr/bin/fsl_imglob.py ${FSLDIR}/bin/imglob
4444

45+
# matplotlib cleanups: set default backend, precaching fonts
46+
RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python3.4/site-packages/matplotlib/mpl-data/matplotlibrc && \
47+
python -c "from matplotlib import font_manager"
48+
4549
# Re-install nipype
4650
COPY . /root/src/nipype
4751
RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \

0 commit comments

Comments
 (0)