Skip to content

Commit 2744d4c

Browse files
authored
Merge pull request #2075 from effigies/update_afni
FIX: Update AFNI pin to current NeuroDebian package
2 parents e02cb4a + ad085ae commit 2744d4c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

circle.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ deployment:
7474
tag: /.*/
7575
commands:
7676
# Deploy to docker hub
77+
- if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/base:latest; fi :
78+
timeout: 21600
7779
- if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/nipype:latest; fi :
7880
timeout: 21600
7981
- 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 :

docker/base.Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,21 @@ RUN curl -sSL http://neuro.debian.net/lists/xenial.us-ca.full >> /etc/apt/source
7474
# Installing general Debian utilities and Neurodebian packages (FSL, AFNI, git)
7575
RUN apt-get update && \
7676
apt-get install -y --no-install-recommends \
77-
fsl-core=5.0.9-1~nd+1+nd16.04+1 \
78-
fsl-mni152-templates=5.0.7-2 \
79-
afni=16.2.07~dfsg.1-2~nd16.04+1 \
77+
fsl-core \
78+
fsl-mni152-templates \
79+
afni \
8080
bzip2 \
81-
ca-certificates \
8281
xvfb \
83-
git=1:2.7.4-0ubuntu1 \
84-
graphviz=2.38.0-12ubuntu2 \
82+
git \
83+
graphviz \
8584
unzip \
8685
apt-utils \
8786
fusefat \
8887
make \
8988
file \
9089
# Added g++ to compile dipy in py3.6
91-
g++=4:5.3.1-1ubuntu1 \
92-
ruby=1:2.3.0+1 && \
90+
g++ \
91+
ruby && \
9392
apt-get clean && \
9493
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
9594

0 commit comments

Comments
 (0)