Skip to content

Commit

Permalink
Merge pull request #28 from thewtex/docker-latest
Browse files Browse the repository at this point in the history
ci(Docker): explicitly use the 'latest' Docker image tag
  • Loading branch information
thewtex authored May 29, 2017
2 parents f74b8ea + 06d4581 commit 0ce7825
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
override:
- docker info
- if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi
- docker pull insighttoolkit/bridgejavascript-test
- docker pull insighttoolkit/bridgejavascript-test:latest
- ~/ITKBridgeJavaScript/test/Docker/build.sh
- npm install
- mkdir -p ~/docker; docker save insighttoolkit/bridgejavascript-test > ~/docker/image.tar
Expand Down Expand Up @@ -45,7 +45,7 @@ deployment:
branch: master
commands:
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
- docker push insighttoolkit/bridgejavascript-test
- docker push insighttoolkit/bridgejavascript-test:latest

general:
branches:
Expand Down
2 changes: 1 addition & 1 deletion test/Docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

script_dir="`cd $(dirname $0); pwd`"

docker build -t insighttoolkit/bridgejavascript-test $script_dir
docker build -t insighttoolkit/bridgejavascript-test:latest $script_dir
2 changes: 1 addition & 1 deletion test/Docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ script_dir="`cd $(dirname $0); pwd`"
docker run \
--rm \
-v $script_dir/../..:/usr/src/ITKBridgeJavaScript \
insighttoolkit/bridgejavascript-test \
insighttoolkit/bridgejavascript-test:latest \
/usr/src/ITKBridgeJavaScript/test/Docker/test.sh

0 comments on commit 0ce7825

Please sign in to comment.