Skip to content

Commit

Permalink
added native feature to test
Browse files Browse the repository at this point in the history
  • Loading branch information
jldowns committed Apr 22, 2016
1 parent 6e7b262 commit e203d03
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ services:
- docker

script:
- ./testing/test_build.sh
- ./testing/test_build.sh --native
12 changes: 9 additions & 3 deletions testing/test_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ else
fi

### Check that Dockerfile builds
docker build --no-cache -t jldowns/vatic-docker:test-build .
# docker build --no-cache -t jldowns/vatic-docker:test-build .

echo "Build passes."

Expand All @@ -36,8 +36,14 @@ docker run -ditP -v "$PWD/data":/root/vatic/data \
jldowns/vatic-docker /bin/bash -C /root/vatic/start_and_block.sh \
)

PORT=$(docker port $JOB 80 | awk -F: '{ print $2 }')
DHOSTIP=$(docker-machine ip default)

if [ $1 = "--native" ]; then
PORT=80
DHOSTIP=localhost
else
PORT=$(docker port $JOB 80 | awk -F: '{ print $2 }')
DHOSTIP=$(docker-machine ip default)
fi

echo "Waiting for server to boot..."
# check 10 times, give 10 seconds between tries, for a total of 100 seconds
Expand Down

0 comments on commit e203d03

Please sign in to comment.