Merge pull request #1307 from effigies/docker/unstable

CI: Deploy poldracklab/fmriprep:unstable tracking master

Author: effigies

.circleci/config.yml

@@ -670,7 +670,7 @@ jobs:
       - store_artifacts:
           path: /tmp/ds210
 
-  deploy:
+  deploy_docker:
     machine:
       image: circleci/classic:201711-01
     working_directory: /tmp/src/fmriprep
@@ -694,10 +694,22 @@ jobs:
           command: |
             if [[ -n "$DOCKER_PASS" ]]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker push poldracklab/fmriprep:latest
-              docker tag poldracklab/fmriprep poldracklab/fmriprep:$CIRCLE_TAG
-              docker push poldracklab/fmriprep:$CIRCLE_TAG
+              docker tag poldracklab/fmriprep poldracklab/fmriprep:unstable
+              docker push poldracklab/fmriprep:unstable
+              if [[ -n "$CIRCLE_TAG" ]]; then
+                docker push poldracklab/fmriprep:latest
+                docker tag poldracklab/fmriprep poldracklab/fmriprep:$CIRCLE_TAG
+                docker push poldracklab/fmriprep:$CIRCLE_TAG
+              fi
             fi
+
+  deploy_pypi:
+    machine:
+      image: circleci/classic:201711-01
+    working_directory: /tmp/src/fmriprep
+    steps:
+      - attach_workspace:
+          at: /tmp
       - run:
           name: Deploy to PyPi
           command: |
@@ -799,7 +811,21 @@ workflows:
             tags:
               only: /.*/
 
-      - deploy:
+      - deploy_docker:
+          requires:
+            - build
+            - test_pytest
+            - build_docs
+            - ds005
+            - ds054
+            - ds210
+          filters:
+            branches:
+              only: master
+            tags:
+              only: /.*/
+
+      - deploy_pypi:
           requires:
             - build
             - test_pytest