Move dockerfiles one level up, rename docker/files, fix circle.yml leftovers from fmriprep

Author: oesteban

circle.yml

@@ -27,9 +27,9 @@ dependencies:
     - 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
-    - docker build -f docker/nipype_test/Dockerfile_py27 -t nipype/nipype_test:py27 . :
+    - docker build -f docker/Dockerfile_py27 -t nipype/nipype_test:py27 . :
         timeout: 1600
-    - docker build -f docker/nipype_test/Dockerfile_py35 -t nipype/nipype_test:py35 . :
+    - 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
@@ -52,9 +52,9 @@ general:
 #   production:
 #     tag: /.*/
 #     commands:
-#       - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push poldracklab/fmriprep:latest; fi :
+#       - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/nipype:latest; fi :
 #           timeout: 21600
-#       - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker tag poldracklab/fmriprep poldracklab/fmriprep:$CIRCLE_TAG && docker push poldracklab/fmriprep:$CIRCLE_TAG; fi :
+#       - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker tag nipype/nipype nipype/nipype:$CIRCLE_TAG && docker push nipype/nipype:$CIRCLE_TAG; fi :
 #           timeout: 21600
 #       - printf "[distutils]\nindex-servers =\n    pypi\n\n[pypi]\nusername:$PYPI_USER\npassword:$PYPI_PASS\n" > ~/.pypirc
 #       - python setup.py sdist upload -r pypi

docker/nipype_test/Dockerfile_base renamed to docker/Dockerfile_base

@@ -34,7 +34,7 @@ RUN conda update -y conda && \
     conda update --all -y python=2.7 && \
     pip install configparser
 
-COPY docker/circleci/run_* /usr/bin/
+COPY docker/files/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
 # Speed up building

docker/nipype_test/Dockerfile_py27 renamed to docker/Dockerfile_py27

@@ -33,7 +33,7 @@ MAINTAINER The nipype developers https://github.com/nipy/nipype
 RUN conda update -y conda && \
     conda update --all -y python=3.4
 
-COPY docker/circleci/run_* /usr/bin/
+COPY docker/files/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
 # Replace imglob with a Python3 compatible version

docker/nipype_test/Dockerfile_py34 renamed to docker/Dockerfile_py34

@@ -31,7 +31,7 @@ MAINTAINER The nipype developers https://github.com/nipy/nipype
 
 WORKDIR /root
 
-COPY docker/circleci/run_* /usr/bin/
+COPY docker/files/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
 # Replace imglob with a Python3 compatible version

docker/nipype_test/Dockerfile_py35 renamed to docker/Dockerfile_py35

@@ -36,7 +36,7 @@ case ${CIRCLE_NODE_INDEX} in
 esac
 
 # Put the artifacts in place
-bash docker/circleci/teardown.sh
+bash docker/files/teardown.sh
 
 # Send coverage data to codecov.io
 curl -so codecov.io https://codecov.io/bash