Skip to content

Commit e9b8798

Browse files
committed
fix: use orb and set up Docker Hub authentication
1 parent e303bf5 commit e9b8798

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed

.circleci/config.yml

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ docs_deploy: &docs
2121
name: Deploy docs to gh-pages branch
2222
command: gh-pages --dotfiles --message "doc(update) [skip ci]" --dist docs/_build/html
2323

24-
version: 2
25-
jobs:
24+
version: 2.1
25+
orbs:
26+
docker: circleci/[email protected]
2627

28+
jobs:
2729
build:
2830
machine:
2931
image: circleci/classic:201711-01
@@ -48,6 +50,13 @@ jobs:
4850
- build-v1-
4951
paths:
5052
- /tmp/docker
53+
- docker/install-docker-credential-helper
54+
- run:
55+
name: Login into Docker Hub
56+
command: |
57+
if [[ -n "$DOCKER_PAT" ]]; then
58+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
59+
fi
5160
- run:
5261
name: Set-up a Docker registry
5362
command: |
@@ -452,6 +461,13 @@ jobs:
452461
- build-v1-
453462
paths:
454463
- /tmp/docker
464+
- docker/install-docker-credential-helper
465+
- run:
466+
name: Login into Docker Hub
467+
command: |
468+
if [[ -n "$DOCKER_PAT" ]]; then
469+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
470+
fi
455471
- run:
456472
name: Set-up a Docker registry
457473
command: |
@@ -466,11 +482,8 @@ jobs:
466482
name: Deploy to Docker Hub
467483
no_output_timeout: 40m
468484
command: |
469-
if [[ -n "$DOCKER_PASS" ]]; then
470-
docker login -u $DOCKER_USER -p $DOCKER_PASS
471-
docker tag nipreps/dmriprep nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
472-
docker push nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
473-
fi
485+
docker tag nipreps/dmriprep nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
486+
docker push nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
474487
475488
deploy_docker:
476489
machine:
@@ -501,6 +514,13 @@ jobs:
501514
- build-v1-
502515
paths:
503516
- /tmp/docker
517+
- docker/install-docker-credential-helper
518+
- run:
519+
name: Login into Docker Hub
520+
command: |
521+
if [[ -n "$DOCKER_PAT" ]]; then
522+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
523+
fi
504524
- run:
505525
name: Set-up a Docker registry
506526
command: |
@@ -515,15 +535,12 @@ jobs:
515535
name: Deploy to Docker Hub
516536
no_output_timeout: 40m
517537
command: |
518-
if [[ -n "$DOCKER_PASS" ]]; then
519-
docker login -u $DOCKER_USER -p $DOCKER_PASS
520-
docker tag nipreps/dmriprep nipreps/dmriprep:unstable
521-
docker push nipreps/dmriprep:unstable
522-
if [[ -n "$CIRCLE_TAG" ]]; then
523-
docker push nipreps/dmriprep:latest
524-
docker tag nipreps/dmriprep nipreps/dmriprep:$CIRCLE_TAG
525-
docker push nipreps/dmriprep:$CIRCLE_TAG
526-
fi
538+
docker tag nipreps/dmriprep nipreps/dmriprep:unstable
539+
docker push nipreps/dmriprep:unstable
540+
if [[ -n "$CIRCLE_TAG" ]]; then
541+
docker push nipreps/dmriprep:latest
542+
docker tag nipreps/dmriprep nipreps/dmriprep:$CIRCLE_TAG
543+
docker push nipreps/dmriprep:$CIRCLE_TAG
527544
fi
528545
529546
test_deploy_pypi:

0 commit comments

Comments
 (0)