From 0b65585c4bc8c1bbbc33dccc47ab0df183d4bc25 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 14 Jun 2017 10:28:40 -0400
Subject: [PATCH 1/3] Update AFNI pin to current NeuroDebian package

---
 docker/base.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 1c4b1c490f..60b7347cf6 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -76,7 +76,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
                     fsl-core=5.0.9-1~nd+1+nd16.04+1 \
                     fsl-mni152-templates=5.0.7-2 \
-                    afni=16.2.07~dfsg.1-2~nd16.04+1 \
+                    afni=16.2.07~dfsg.1-5~nd16.04+1 \
                     bzip2 \
                     ca-certificates \
                     xvfb \

From 610af0e53fd21d51bc86db2e34c7c50074107a83 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 14 Jun 2017 11:47:35 -0400
Subject: [PATCH 2/3] Remove APT version pins

---
 docker/base.Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 60b7347cf6..cc0d80f611 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -74,22 +74,21 @@ RUN curl -sSL http://neuro.debian.net/lists/xenial.us-ca.full >> /etc/apt/source
 # Installing general Debian utilities and Neurodebian packages (FSL, AFNI, git)
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-                    fsl-core=5.0.9-1~nd+1+nd16.04+1 \
-                    fsl-mni152-templates=5.0.7-2 \
-                    afni=16.2.07~dfsg.1-5~nd16.04+1 \
+                    fsl-core \
+                    fsl-mni152-templates \
+                    afni \
                     bzip2 \
-                    ca-certificates \
                     xvfb \
-                    git=1:2.7.4-0ubuntu1 \
-                    graphviz=2.38.0-12ubuntu2 \
+                    git \
+                    graphviz \
                     unzip \
                     apt-utils \
                     fusefat \
                     make \
                     file \
                     # Added g++ to compile dipy in py3.6
-                    g++=4:5.3.1-1ubuntu1 \
-                    ruby=1:2.3.0+1 && \
+                    g++ \
+                    ruby && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

From ad085ae86c9dbb97aedb316562ea31f79c5923fe Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Wed, 14 Jun 2017 11:52:12 -0400
Subject: [PATCH 3/3] CI: Push nipype/base:latest on release

---
 circle.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/circle.yml b/circle.yml
index b122653b79..5624dbb7f8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -74,6 +74,8 @@ deployment:
     tag: /.*/
     commands:
       # Deploy to docker hub
+      - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/base:latest; fi :
+          timeout: 21600
       - 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 nipype/nipype nipype/nipype:$CIRCLE_TAG && docker push nipype/nipype:$CIRCLE_TAG; fi :