Skip to content

Commit

Permalink
Fixed deployment on docker hub
Browse files Browse the repository at this point in the history
  • Loading branch information
Warchant committed Jan 19, 2017
1 parent 54dddfc commit 2d72f50
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
7 changes: 4 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ test:
# first, run ctest inside a container
- docker run -p 1204:1204 hyperledger/iroha-docker /test.sh
# then, run iroha with dummy config (1 node) and test curl request
- docker run -d -p 1204:1204 hyperledger/iroha-docker /run.sh && sleep 5 && curl -X POST http://127.0.0.1:1204/account/register -d '{"publicKey":"WdvM/DPabapmtA7ISbTYPywbHxk8gWu2221LzmcmAgw=","alias":"yonezu","timestamp":1482053586}'
- docker run -d -p 1204:1204 hyperledger/iroha-docker /run.sh && sleep 5
- curl -X POST http://127.0.0.1:1204/account/register -d '{"publicKey":"WdvM/DPabapmtA7ISbTYPywbHxk8gWu2221LzmcmAgw=","alias":"yonezu","timestamp":1482053586}'


deployment:
hub:
branch: master
commands:
- docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
- docker push hyperledger/iroha-docker
# makes docker login and docker push $1
- ${IROHA_HOME}/deploy.sh hyperledger/iroha-docker
24 changes: 24 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
sudo apt-get install -yqq expect


if [ -z "$1" ]; then
echo "Supply first argument: docker hub tag"
fi


if [[ ! -e ~/.docker/config.json ]]; then
expect -c '\
set timeout 5
spawn docker login
expect "Username:*"
send -- "$env(DOCKER_USER)\r"
expect "Password:*"
send -- "$env(DOCKER_PASS)\r"
expect "Email:*"
send -- "$env(DOCKER_EMAIL)\r"
expect "*WARNING:*Login Succeeded*"
expect eof' 1>/dev/null || exit 1
fi

docker push $1

0 comments on commit 2d72f50

Please sign in to comment.