Skip to content

Commit ca2c38c

Browse files
Merge pull request #32 from thiagobustamante/master
Fix travis
2 parents 27b4586 + 81611d5 commit ca2c38c

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ coverage
1919
logs
2020
benchmark
2121
Jenkinsfile
22+
deploy-docker.sh

.travis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ before_install:
1313
- docker run -p 8500:8500 -d --name tree_consul consul
1414

1515
script: nyc npm run test && nyc report --reporter=text-lcov | coveralls
16-
after_success:
17-
if ([ "$TRAVIS_BRANCH" == "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
18-
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
19-
export REPO=treegateway/tree-gateway
20-
export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "master"; else echo $TRAVIS_BRANCH ; fi`
21-
docker build -f Dockerfile -t $REPO:$TAG .
22-
docker tag $REPO:$TAG $REPO:latest
23-
docker push $REPO
24-
else
25-
echo "Skiping docker hub deploy!"
26-
fi
2716
deploy:
2817
- provider: npm
2918
@@ -33,3 +22,10 @@ deploy:
3322
on:
3423
tags: true
3524
repo: Leanty/tree-gateway
25+
- provider: srcipt
26+
skip_cleanup: true
27+
script:
28+
deploy-docker.sh
29+
on:
30+
tags: true
31+
repo: Leanty/tree-gateway

deploy-docker.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
2+
export REPO=treegateway/tree-gateway
3+
export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "master"; else echo $TRAVIS_BRANCH ; fi`
4+
docker build -f Dockerfile -t $REPO:$TAG .
5+
docker tag $REPO:$TAG $REPO:latest
6+
docker push $REPO

0 commit comments

Comments
 (0)