diff options
| author | James E. King, III <jking@apache.org> | 2017-10-21 10:16:19 -0400 |
|---|---|---|
| committer | James E. King, III <jking@apache.org> | 2017-10-23 14:13:46 -0400 |
| commit | cd5be7be702bac300a658184fa0b496debdfee72 (patch) | |
| tree | ae9696ebd28febcaab1c072409a789ab17dae627 /.travis.yml | |
| parent | 54ce558ba80905d124b82727d196f6d58964b74c (diff) | |
| download | thrift-cd5be7be702bac300a658184fa0b496debdfee72.tar.gz | |
THRIFT-4351: change DOCKER_ env vars for travis integration to work better,
ready for enabling job on PRs
This closes #1397
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 0f9500c6e..9a94e3649 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,25 +21,8 @@ # # Docker Integration +# see: build/docker/README.md # -# DOCKER_REPO -# [required] The repository name (within your account). -# DOCKER_PASS -# [optional, secure] Your docker account password. -# If you do not set this, each build job in the "test" -# stage might rebuild the docker image and extend build -# time by about 10 minutes per job. If you do set this -# then each build job in the "docker" stage" will build -# the docker image if Dockerfile has changed, and then -# push the new tag up to your docker hub account. -# DOCKER_USER -# [required] Your docker hub account name. -# -# The resulting tag is: -# $DOCKER_USER/$DOCKER_REPO:$DISTRO -# example (and the default): -# apache/thrift:ubuntu-xenial -# sudo: required dist: trusty @@ -64,8 +47,10 @@ env: - DISTRO=ubuntu-xenial - BUILD_LIBS="CPP C_GLIB HASKELL JAVA PYTHON TESTING TUTORIALS" # only meaningful for CMake builds - TRAVIS_BUILD_STAGE=test - - DEFAULT_DOCKER_USER="apache" - - DEFAULT_DOCKER_REPO="thrift" + # DOCKER_REPO (this works for all builds as a source for docker images - you can override for fork builds in your Travis settings) + - DOCKER_REPO="thrift/thrift-build" + # DOCKER_USER (provide in your Travis settings if you want to build and update docker images once, instead of on every job) + # DOCKER_PASS (same) jobs: include: |