Skip to content

Commit 7f0e708

Browse files
authored
Feature/configure travis and add images (#17)
* modified docker-compose up command in travis.yml file to build for edge service until a image is up on docker hub to pull from instead of building
1 parent 0994082 commit 7f0e708

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

.travis.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
11
language: java
22
jdk:
33
- oraclejdk8
4-
5-
sudo: required
6-
74
services:
85
- docker
9-
6+
sudo: required
107
before_script:
118
- sudo service mysql stop
9+
env:
10+
global:
11+
- secure: WF5U05+p8xQRBhT75aviCl9sXpnzER52xJDkKaZPtsak3B/21rj5FGQ4TTu9ivh0oF56ws8Zy8hzNZhjS09QimqtpD+Zl5m5er4Q2GvrStVDM0k38wqye2IBf7juKIlkfntX1o1E9/xGkUgIW5eQpUt7TDGpon5FCvY8NHqDyVi+ZDU7hGQh8E3oyK+8Dly1ETLxVhoDEY3vG1VyEZ1IDrgAw/N6KlNIyiuWjPMBLTFAjGMzJAaf/MQiKfmB3HUBUtGqEdhobppEqriJkXl/6ov+Np+vh83dIBaOfRUpB1KgvGmefmtL7rb+mIIXOLMm9cpyqmK+6h1JeQrwB3xtWtIIXmmL2VEwmO/2YfTDyu+JpRkkgwDMLgyRKN9wEtaR+4C3X/p9zMysocDhyccOeGVq7XhJwgdosoJ0VRLVtUhPq1T10B/ipp2g8VF9TW1uIfSQJe6YYCrVK+fqtkWG5yuOfqQdGHNZkRJMpeTyzkJQzX7GZb8G0H8EZCsjdJ0FdEpshWcCB2ljozwH3fFMqnzE1thibpg7dC2BXF7aRGjmn/4vqme98i4hP+590FIMF+sdyDItVq7/91EAwh7m35dvszkFruIzLgHFRnrKAgG76bTHTz8bwywhnCZVbDmy/HEDOjj2ykW9jPKJ7buKRKVYbXnSgYqkn/keTHiRvLI=
12+
- secure: KlDa/wnlEEvkH4tnxTtxdWdBHJl8Kuv8tWknqxKL1rWcvo8UXNWXeBtvAB5v7eiCSJLwOqLm9Cl4OVwnZjU3oi4ymECYY296bQRFGS01DDYeExFd/VycDvV2L9FRP+71qZt2k2/DBabheI2WNLXESyAG1oJcI7IYyiDQBoA7hz72dYjQ5T8NISab8KGLCq02mvh3n+rtchgOPtbxU2wGqse+3lzui4m9/qAC+3tZJNXx7l+hzNSh1zqIhjIrzXrPs0PneCLdfTl1lZhSO2DCBo9juz2bisSdOdOWt7hssb7noOByfU9z1O2QVUfWJfUTjVwToxFaP94JeUo6rDo3gRo2WJn313f8ZtgtzQkPYrV8bTTRZ8mhb7D2Eq/2RllBRXJRdQuOv1t7mSr+hdD/mJUyHQY6yvK3YFAKkgK60aUAGMhBE2GBVFzx7qU06OBwdHJ2YBiKSC/+9sGFVhR6zIQxVPV4fdyaLLL4CEJC1vvTmHYZj1hqSZsWhuqddxQNj0RKIsfN8akW/Gi4mv2q32eCwG6XhXIKqLGVGuyHKx1N3gCjBK3Whz5QX/u8ADq7euB+mgyC/wILrzb281VARQkuu5FwUutv0x+y4S/061VZATwhY+ree728mjSxHu5qtoyI3xH6OjWDtmp+zyZOdrF2D+/ReiIRd4vkShme7sI=
13+
before_install:
14+
- echo "Testing Docker Hub credentials"
15+
- docker -v
16+
- docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD
17+
- echo "Docker Hub credentials are working"
18+
after_success:
19+
- export ACTUAL_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH;
20+
else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
21+
- echo "Test Success - BranchActual($ACTUAL_BRANCH) Pull Request($TRAVIS_PULL_REQUEST)
22+
Tag($TRAVIS_TAG) PR($TRAVIS_PULL_REQUEST) Build($TRAVIS_BUILD_NUMBER)"
23+
- if [[ "$ACTUAL_BRANCH" == "master" ]]; then echo -e "Push Container to Docker Hub";
24+
fi
25+
- docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD
26+
- export REPO=aista/edge-service
27+
- export TAG=`if [ "$ACTUAL_BRANCH" == "master" ]; then echo "latest";else echo "";
28+
fi`
29+
- docker build -f Dockerfile -t $REPO:$TAG .
30+
- docker push $REPO

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ services:
124124
- discoveryservice
125125

126126
passenger:
127-
build: ../passenger/
127+
image: aista/passenger
128128
ports:
129129
- '8080'
130130
depends_on:

0 commit comments

Comments
 (0)