tweaks to speed up image build

Author: oesteban

docker/nipype_test/Dockerfile_py27

@@ -52,16 +52,15 @@ RUN conda config --add channels conda-forge && \
 COPY docker/circleci/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
+# Speed up building
 RUN mkdir -p /root/src/nipype
-COPY . /root/src/nipype
+COPY requirements.txt /root/src/nipype/requirements.txt
+RUN pip install -r /root/src/nipype/requirements.txt
 
+# Re-install nipype
+COPY . /root/src/nipype
 RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
     cd /root/src/nipype && \
-    pip install -r requirements.txt && \
     pip install -e . 
 
-# Replace imglob with Python3 compatible version
-RUN rm -r ${FSLDIR}/bin/imglob && \
-    ln -s $(which fsl_imglob.py) ${FSLDIR}/bin/imglob
-
 CMD ["/bin/bash"]

docker/nipype_test/Dockerfile_py34

@@ -54,16 +54,21 @@ RUN conda config --add channels conda-forge && \
 COPY docker/circleci/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
+# Replace imglob with Python3 compatible version
+COPY nipype/external/fsl_imglob.py /usr/bin/fsl_imglob.py
+RUN rm -r ${FSLDIR}/bin/imglob && \
+    chmod +x /usr/bin/fsl_imglob.py && \
+    ln -s /usr/bin/fsl_imglob.py ${FSLDIR}/bin/imglob
+
+# Speed up building
 RUN mkdir -p /root/src/nipype
-COPY . /root/src/nipype
+COPY requirements.txt /root/src/nipype/requirements.txt
+RUN pip install -r /root/src/nipype/requirements.txt
 
-RUN rm -r /usr/local/miniconda/lib/python3.5/site-packages/nipype* && \
+# Re-install nipype
+COPY . /root/src/nipype
+RUN rm -r /usr/local/miniconda/lib/python3.4/site-packages/nipype* && \
     cd /root/src/nipype && \
-    pip install -r requirements.txt && \
-    pip install -e .
-
-# Replace imglob with Python3 compatible version
-RUN rm -r ${FSLDIR}/bin/imglob && \
-    ln -s $(which fsl_imglob.py) ${FSLDIR}/bin/imglob
+    pip install -e . 
 
 CMD ["/bin/bash"]

docker/nipype_test/Dockerfile_py35

@@ -52,16 +52,21 @@ RUN conda config --add channels conda-forge && \
 COPY docker/circleci/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
+# Replace imglob with Python3 compatible version
+COPY nipype/external/fsl_imglob.py /usr/bin/fsl_imglob.py
+RUN rm -r ${FSLDIR}/bin/imglob && \
+    chmod +x /usr/bin/fsl_imglob.py && \
+    ln -s /usr/bin/fsl_imglob.py ${FSLDIR}/bin/imglob
+
+# Speed up building
 RUN mkdir -p /root/src/nipype
-COPY . /root/src/nipype
+COPY requirements.txt /root/src/nipype/requirements.txt
+RUN pip install -r /root/src/nipype/requirements.txt
 
+# Re-install nipype
+COPY . /root/src/nipype
 RUN rm -r /usr/local/miniconda/lib/python3.5/site-packages/nipype* && \
     cd /root/src/nipype && \
-    pip install -r requirements.txt && \
-    pip install -e .
-
-# Replace imglob with Python3 compatible version
-RUN rm -r ${FSLDIR}/bin/imglob && \
-    ln -s $(which fsl_imglob.py) ${FSLDIR}/bin/imglob
+    pip install -e . 
 
 CMD ["/bin/bash"]