Skip to content

Commit

Permalink
Fix travis ci push docker image, move ilha/bothub to ilha/bothub-engi…
Browse files Browse the repository at this point in the history
…ne in docker hub
  • Loading branch information
dougppaz committed Jun 27, 2018
1 parent 8d7461f commit 7b75fbf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ env:
global:
- SECRET_KEY=SK
- SUPPORTED_LANGUAGES="en pt"
- DOCKER_IMAGE_NAME=ilha/bothub-engine
script:
- flake8
- travis_wait coverage run manage.py test
after_success:
- coveralls
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
- '[[ $TRAVIS_EVENT_TYPE == "push" && $TRAVIS_BRANCH == "master" || $TRAVIS_EVENT_TYPE == "push" && $TRAVIS_BRANCH == "develop" ]] && docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASS && docker-compose -f docker/docker-compose.yml build && docker push $DOCKER_HUB_REPO:$TAG'
- '[[ $TRAVIS_EVENT_TYPE == "push" && $TRAVIS_BRANCH == "master" || $TRAVIS_EVENT_TYPE == "push" && $TRAVIS_BRANCH == "develop" ]] && docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASS && docker-compose -f docker/docker-compose.yml build && docker push $DOCKER_IMAGE_NAME:$TAG'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Run ```pipenv run python ./manage.py fill_db_using_fake_data``` to fill database

## Production

Docker images available in [Bothub's Docker Hub repository](https://hub.docker.com/r/ilha/bothub/).
Docker images available in [Bothub's Docker Hub repository](https://hub.docker.com/r/ilha/bothub-engine/).

## Environment Variables

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.3'

services:
bothub:
image: ${DOCKER_HUB_REPO:-ilha/bothub}:${TAG:-latest}
image: ${DOCKER_IMAGE_NAME:-ilha/bothub-engine}:${TAG:-latest}
build:
context: ..
dockerfile: docker/Dockerfile
Expand Down

0 comments on commit 7b75fbf

Please sign in to comment.