Skip to content

Commit 1f17d28

Browse files
committed
enable circleCI deploy to Docker Hub, hopefully fix permissions after conda update
1 parent b48da5b commit 1f17d28

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

circle.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ machine:
1010
services:
1111
- docker
1212

13+
# Disable python
14+
checkout:
15+
post:
16+
- rm -rf virtualenvs venv .pyenv
17+
1318
dependencies:
1419
cache_directories:
1520
- "~/docker"
@@ -47,14 +52,14 @@ general:
4752
- "~/docs"
4853
- "~/logs"
4954

50-
# To enable when ready
51-
# deployment:
52-
# production:
53-
# tag: /.*/
54-
# commands:
55-
# - if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/nipype:latest; fi :
56-
# timeout: 21600
57-
# - 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 :
58-
# timeout: 21600
55+
deployment:
56+
production:
57+
tag: /.*/
58+
commands:
59+
- if [[ -n "$DOCKER_PASS" ]]; then docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS && docker push nipype/nipype:latest; fi :
60+
timeout: 21600
61+
- 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 :
62+
timeout: 21600
63+
# Automatic deployment to Pypi:
5964
# - printf "[distutils]\nindex-servers =\n pypi\n\n[pypi]\nusername:$PYPI_USER\npassword:$PYPI_PASS\n" > ~/.pypirc
60-
# - python setup.py sdist upload -r pypi
65+
# - python setup.py sdist upload -r pypi

docker/Dockerfile_py27

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
FROM nipype/nipype:latest
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
3131

32-
# Downgrade python to 2.7
33-
RUN conda install python=2.7
34-
3532
COPY docker/files/run_* /usr/bin/
3633
RUN chmod +x /usr/bin/run_*
3734

35+
# Downgrade python to 2.7
3836
# matplotlib cleanups: set default backend, precaching fonts
39-
RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc && \
37+
RUN conda install python=2.7 && \
38+
find /usr/local/miniconda/ -exec chmod 775 {} + && \
39+
sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc && \
4040
python -c "from matplotlib import font_manager"
4141

4242
# Re-install nipype

0 commit comments

Comments
 (0)