diff --git a/.travis.yml b/.travis.yml index cfcec4ace3..c1e8519c52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jobs: include: - dist: trusty compiler: gcc - env: wxGTK_VERSION=2 wxUSE_XVFB=1 wxUSE_DOCKER_HTTPBIN=1 + env: wxGTK_VERSION=2 wxUSE_XVFB=1 name: wxGTK 2 Ubuntu 14.04 - dist: bionic compiler: gcc diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 18dbcc0d0d..c5b786bce4 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -16,17 +16,9 @@ launch_httpbin() { echo 'travis_fold:start:httpbin' echo 'Running httpbin...' - # Use docker if configured to do so, this works around Python/pip problems - # on some platforms. - if [ "$wxUSE_DOCKER_HTTPBIN" = 1 ]; then - docker pull kennethreitz/httpbin - docker run -d -p 80:80 kennethreitz/httpbin - WX_TEST_WEBREQUEST_URL="http://localhost" - else - pip install httpbin - python -m httpbin.core & - WX_TEST_WEBREQUEST_URL="http://localhost:5000" - fi + pip install httpbin --user + python -m httpbin.core & + WX_TEST_WEBREQUEST_URL="http://localhost:5000" export WX_TEST_WEBREQUEST_URL echo 'travis_fold:end:httpbin'