create tags for python versions

Author: oesteban

docker/nipype_test_base/Dockerfile

@@ -43,6 +43,7 @@ RUN sed -i -e 's,main$,main contrib non-free,g' /etc/apt/sources.list.d/neurodeb
                        apt-utils \
                        fusefat \
                        graphviz \
+                       make \
                        fsl-core && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     echo ". /etc/fsl/fsl.sh" >> /etc/bash.bashrc

docker/nipype_test_py34/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, The developers of the Stanford CRN
+# Copyright (c) 2016, The developers of nipype
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,19 +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/testbase:latest
-MAINTAINER Stanford Center for Reproducible Neuroscience <[email protected]>
-
+FROM nipype/nipype_test:base
+MAINTAINER The nipype developers https://github.com/nipy/nipype
 # Preparations
 RUN ln -snf /bin/bash /bin/sh
 WORKDIR /root
 
 # Install miniconda
-RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
-    /bin/bash Miniconda-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
-    rm Miniconda-latest-Linux-x86_64.sh && \
-    echo '#!/bin/bash' >> /etc/profile.d/nipype.sh && \
-    echo 'export PATH=/usr/local/miniconda/bin:$PATH' >> /etc/profile.d/nipype.sh
+RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
+    /bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
+    rm Miniconda3-latest-Linux-x86_64.sh
 
 ENV PATH /usr/local/miniconda/bin:$PATH
 
@@ -47,27 +44,21 @@ ENV PATH /usr/local/miniconda/bin:$PATH
 ENV LANG C.UTF-8
 
 # Add conda-forge channel in conda
-RUN conda config --add channels conda-forge
+RUN conda config --add channels conda-forge && \
+    conda update -y conda && \
+    conda update --all -y python=3.4 && \
+    conda install -y lockfile nipype
 
-# Create conda environment
-RUN conda create -y -n nipypetests-2.7 lockfile nipype && \
-    echo '#!/bin/bash' >> /etc/profile.d/nipype.sh && \
-    echo '#!/bin/bash' >> /etc/bashrc && \
-    echo 'source activate nipypetests-2.7' >> /etc/profile.d/nipype.sh
+RUN mkdir -p /root/src/nipype
+COPY . /root/src/nipype
 
-# Create conda environment
-RUN conda create -y -n nipypetests-3.4 lockfile nipype python=3.4 
+RUN cd /root/src/nipype && \
+    pip install -r requirements.txt && \
+    pip install -e .
 
-# Create conda environment
-RUN conda create -y -n nipypetests-3.5 lockfile nipype python=3.5
 
-# Install dipy
-RUN source activate nipypetests-2.7 && \
-    pip install dipy && \
-    source activate nipypetests-3.4 && \
-    pip install dipy && \
-    source activate nipypetests-3.5 && \
-    pip install dipy
+COPY docker/circleci/run_* /usr/bin/
+RUN chmod +x /usr/bin/run_*
+ENV SHELL /bin/bash
 
-RUN echo "source /etc/profile.d/nipype.sh" >> /etc/bash.bashrc
 CMD ["/bin/bash"]

docker/nipype_test_py35/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, The developers of the Stanford CRN
+# Copyright (c) 2016, The developers of nipype
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,19 +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/testbase:latest
-MAINTAINER Stanford Center for Reproducible Neuroscience <[email protected]>
-
+FROM nipype/nipype_test:base
+MAINTAINER The nipype developers https://github.com/nipy/nipype
 # Preparations
 RUN ln -snf /bin/bash /bin/sh
 WORKDIR /root
 
 # Install miniconda
-RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
-    /bin/bash Miniconda-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
-    rm Miniconda-latest-Linux-x86_64.sh && \
-    echo '#!/bin/bash' >> /etc/profile.d/nipype.sh && \
-    echo 'export PATH=/usr/local/miniconda/bin:$PATH' >> /etc/profile.d/nipype.sh
+RUN curl -sSLO https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
+    /bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
+    rm Miniconda3-latest-Linux-x86_64.sh
 
 ENV PATH /usr/local/miniconda/bin:$PATH
 
@@ -47,27 +44,19 @@ ENV PATH /usr/local/miniconda/bin:$PATH
 ENV LANG C.UTF-8
 
 # Add conda-forge channel in conda
-RUN conda config --add channels conda-forge
+RUN conda config --add channels conda-forge && \
+    conda install -y lockfile nipype
 
-# Create conda environment
-RUN conda create -y -n nipypetests-2.7 lockfile nipype && \
-    echo '#!/bin/bash' >> /etc/profile.d/nipype.sh && \
-    echo '#!/bin/bash' >> /etc/bashrc && \
-    echo 'source activate nipypetests-2.7' >> /etc/profile.d/nipype.sh
+RUN mkdir -p /root/src/nipype
+COPY . /root/src/nipype
 
-# Create conda environment
-RUN conda create -y -n nipypetests-3.4 lockfile nipype python=3.4 
+RUN cd /root/src/nipype && \
+    pip install -r requirements.txt && \
+    pip install -e .
 
-# Create conda environment
-RUN conda create -y -n nipypetests-3.5 lockfile nipype python=3.5
 
-# Install dipy
-RUN source activate nipypetests-2.7 && \
-    pip install dipy && \
-    source activate nipypetests-3.4 && \
-    pip install dipy && \
-    source activate nipypetests-3.5 && \
-    pip install dipy
+COPY docker/circleci/run_* /usr/bin/
+RUN chmod +x /usr/bin/run_*
+ENV SHELL /bin/bash
 
-RUN echo "source /etc/profile.d/nipype.sh" >> /etc/bash.bashrc
 CMD ["/bin/bash"]