Merge branch 'master' into fix-logger

This commit is contained in:
tgruben 2018-10-01 13:34:27 -05:00 committed by GitHub
commit 223bbd4d85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -72,6 +72,16 @@ jobs:
- *fast-checkout
- run: sudo pip install awscli
- run: make prerelease-upload
dockerhub-upload:
<<: *defaults
steps:
- run: '[[ -v CIRCLE_PR_NUMBER ]] && circleci step halt || true' # Skip job if this is a PR
- *fast-checkout
- setup_remote_docker
- run: make docker
- run: docker tag pilosa:$(git describe --tags) pilosa/pilosa:master
- run: docker login -u $DOCKER_USER -p $DOCKER_PASS
- run: docker push pilosa/pilosa:master
workflows:
version: 2
test:
@ -105,3 +115,7 @@ workflows:
- prerelease-upload:
requires:
- prerelease
- dockerhub-upload:
requires:
- linter
- test-golang-1.10