base all test images in main docker image

Author: oesteban

circle.yml

@@ -20,21 +20,19 @@ dependencies:
     - sudo apt-get -y update && sudo apt-get install -y wget bzip2
 
   override:
-    - mkdir -p ~/docker ~/examples ~/scratch/pytest ~/scratch/logs
+    - mkdir -p $HOME/docker $HOME/examples $HOME/scratch/pytest $HOME/scratch/logs
     - if [[ ! -d ~/examples/nipype-tutorial ]]; then wget --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 -t 0 -q -O nipype-tutorial.tar.bz2 "${DATA_NIPYPE_TUTORIAL_URL}" && tar xjf nipype-tutorial.tar.bz2 -C ~/examples/; fi
     - if [[ ! -d ~/examples/nipype-fsl_course_data ]]; then wget --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 -t 0 -q -O nipype-fsl_course_data.tar.gz "${DATA_NIPYPE_FSL_COURSE}" && tar xzf nipype-fsl_course_data.tar.gz -C ~/examples/; fi
     - if [[ ! -d ~/examples/feeds ]]; then wget --retry-connrefused --waitretry=5 --read-timeout=20 --timeout=15 -t 0 -q -O fsl-5.0.9-feeds.tar.gz "${DATA_NIPYPE_FSL_FEEDS}" && tar xzf fsl-5.0.9-feeds.tar.gz -C ~/examples/; fi
-    - if [[ -e ~/docker/image.tar ]]; then mv -n ~/docker/image.tar ~/docker/image_27.tar; fi
-    - if [[ -e ~/docker/image_27.tar ]]; then docker load -i ~/docker/image_27.tar; fi
-    - if [[ -e ~/docker/image_35.tar ]]; then docker load -i ~/docker/image_35.tar; fi
+    - if [[ -e $HOME/docker/image.tar ]]; then docker load -i $HOME/docker/image.tar; fi
+    - sed -i -E "s/(__version__ = )'[A-Za-z0-9.-]+'/\1'$CIRCLE_TAG'/" nipype/info.py
+    - e=1 && for i in {1..5}; do docker build -t nipype/nipype:latest --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg VERSION=$CIRCLE_TAG . && e=0 && break || sleep 15; done && [ "$e" -eq "0" ] :
+        timeout: 21600
+    - docker save nipype/nipype:latest > $HOME/docker/image.tar
     - docker build -f docker/Dockerfile_py27 -t nipype/nipype_test:py27 . :
         timeout: 1600
     - docker build -f docker/Dockerfile_py35 -t nipype/nipype_test:py35 . :
         timeout: 1600
-    - docker save nipype/nipype_test:py27 > ~/docker/image_27.tar :
-        timeout: 1600
-    - docker save nipype/nipype_test:py35 > ~/docker/image_35.tar :
-        timeout: 1600
 
 test:
   override:

docker/Dockerfile_py27

@@ -26,23 +26,16 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-FROM nipype/nipype_test:base-0.0.2
+FROM nipype/nipype:latest
 MAINTAINER The nipype developers https://github.com/nipy/nipype
 
 # Downgrade python to 2.7
-RUN conda update -y conda && \
-    conda update --all -y python=2.7 && \
-    pip install configparser
+RUN conda install python=2.7 && \
+    conda update --all -y python=2.7
 
 COPY docker/files/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
-# Speed up building
-RUN mkdir -p /root/src/nipype
-COPY requirements.txt /root/src/nipype/requirements.txt
-RUN pip install -r /root/src/nipype/requirements.txt && \
-    sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc
-
 # Re-install nipype
 COPY . /root/src/nipype
 RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \

docker/Dockerfile_py34

@@ -26,11 +26,11 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-FROM nipype/nipype_test:base-0.0.2
+FROM nipype/nipype:latest
 MAINTAINER The nipype developers https://github.com/nipy/nipype
 
 # Downgrade python to 3.4
-RUN conda update -y conda && \
+RUN conda install python=3.4 && \
     conda update --all -y python=3.4
 
 COPY docker/files/run_* /usr/bin/
@@ -42,16 +42,10 @@ 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 requirements.txt /root/src/nipype/requirements.txt
-RUN pip install -r /root/src/nipype/requirements.txt && \
-    sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python3.4/site-packages/matplotlib/mpl-data/matplotlibrc
-
 # Re-install nipype
 COPY . /root/src/nipype
-RUN rm -r /usr/local/miniconda/lib/python3.4/site-packages/nipype* && \
+RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
     cd /root/src/nipype && \
     pip install -e .[all]
 
-CMD ["/bin/bash"]
+CMD ["/bin/bash"]

docker/Dockerfile_py35

@@ -29,27 +29,14 @@
 FROM nipype/nipype_test:base-0.0.2
 MAINTAINER The nipype developers https://github.com/nipy/nipype
 
-WORKDIR /root
-
-COPY docker/files/run_* /usr/bin/
-RUN chmod +x /usr/bin/run_*
-
 # Replace imglob with a 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
+COPY docker/files/run_* /usr/bin/
+RUN chmod +x /usr/bin/run_*
 
-# Speed up building
-RUN mkdir -p /root/src/nipype
-COPY requirements.txt /root/src/nipype/requirements.txt
-RUN pip install -r /root/src/nipype/requirements.txt && \
-    sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python3.5/site-packages/matplotlib/mpl-data/matplotlibrc
-
-# 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 -e .[all]
+WORKDIR /root
 
 CMD ["/bin/bash"]