kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2916 from swagger-api/feature/docker-tag-fix

Browse Source 
Feature/docker tag fix
This commit is contained in:
Tony Tam
2017-04-14 17:28:20 -04:00
committed by GitHub
parent e33efa1b36 205197d04f
commit 89adefe392
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@@ -23,11 +23,18 @@ deploy:
after_success: after_success:
- if [ $DOCKER_HUB_USERNAME ]; then - if [ $DOCKER_HUB_USERNAME ]; then
docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD; docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD;
if [ ! -z "$TRAVIS_TAG" ]; then
DOCKER_IMAGE_TAG=$TRAVIS_TAG;
else
DOCKER_IMAGE_TAG=unstable;
fi;
docker build -t $DOCKER_IMAGE_NAME .; docker build -t $DOCKER_IMAGE_NAME .;
if [ ! -z "$TRAVIS_TAG" ]; then if [ ! -z "$TRAVIS_TAG" ]; then
docker tag $DOCKER_IMAGE_NAME:latest $DOCKER_IMAGE_NAME:$TRAVIS_TAG; docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:$TRAVIS_TAG;
fi; docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:latest;
if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then else
docker push $DOCKER_IMAGE_NAME; docker tag $DOCKER_IMAGE_NAME $DOCKER_IMAGE_NAME:unstable;
fi; fi;
fi; fi;

1
docker-run.sh
View File

@@ -42,5 +42,4 @@ if [[ -n "$VALIDATOR_URL" ]]; then
sed -i "s|\(url: url,.*\)|\1\n validatorUrl: \"${VALIDATOR_URL}\",|g" $INDEX_FILE sed -i "s|\(url: url,.*\)|\1\n validatorUrl: \"${VALIDATOR_URL}\",|g" $INDEX_FILE
fi fi
#exec http-server -p $PORT $*
exec nginx -g 'daemon off;' exec nginx -g 'daemon off;'