diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-02-19 12:48:33 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | 483533d3a21a9d689aafb4c259301aa44cef75ed (patch) | |
| tree | 7acb3a522eae9b4225881ca92f494e69e1ff2c46 /tools | |
| parent | 0b931bcd53897954cf96cd8075bb6fc16651559d (diff) | |
| download | protobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.tar.gz protobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.tar.bz2 protobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.zip | |
Install Python deps in Docker image.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/Dockerfile | 26 | ||||
| -rwxr-xr-x | tools/run_tests/jenkins.sh | 9 | ||||
| -rwxr-xr-x | tools/run_tests/tests.sh | 3 |
3 files changed, 25 insertions, 13 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 7d9def05..b5b712fa 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -30,6 +30,10 @@ # Base Dockerfile for gRPC dev images FROM debian:latest +RUN echo 'deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu trusty main' > /etc/apt/sources.list.d/deadsnakes.list && \ + gpg --keyserver keyserver.ubuntu.com --recv-keys DB82666C && \ + gpg --export DB82666C | apt-key add - + # Install dependencies. We start with the basic ones require to build protoc # and the C++ build RUN apt-get update && apt-get install -y \ @@ -48,19 +52,19 @@ RUN apt-get update && apt-get install -y \ libtool \ make \ parallel \ - strace \ - python-dev \ - python-setuptools \ - telnet \ - unzip \ - wget \ - zip \ - # For all Java builds \ + # -- For all Java builds -- \ maven \ - # For java_jdk6 \ - # oops! not in Jessie. Too old? openjdk-6-jdk \ - # For java_jdk7 \ + # -- For java_jdk6 -- \ + # oops! not in jessie. too old? openjdk-6-jdk \ + # -- For java_jdk7 -- \ openjdk-7-jdk \ + # -- For python / python_cpp -- \ + python-setuptools \ + python-tox \ + python-dev \ + python2.6-dev \ + python3.3-dev \ + python3.4-dev \ && apt-get clean # Prepare ccache diff --git a/tools/run_tests/jenkins.sh b/tools/run_tests/jenkins.sh index c0d02ddc..1d192aa4 100755 --- a/tools/run_tests/jenkins.sh +++ b/tools/run_tests/jenkins.sh @@ -26,5 +26,10 @@ $TEST_SCRIPT cpp | tee $OUTPUT_DIR/1/cpp # Other tests are run in parallel. The overall run fails if any one of them # fails. -# java_jdk6 -parallel $TEST_SCRIPT ::: java_jdk7 javanano_jdk7 +parallel $TEST_SCRIPT ::: \ + java_jdk7 \ + javanano_jdk7 \ + python \ + python_cpp + +# java_jdk6 \ diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh index db499755..5281cd20 100755 --- a/tools/run_tests/tests.sh +++ b/tools/run_tests/tests.sh @@ -152,6 +152,9 @@ build_javanano_oracle7() { } internal_install_python_deps() { + if [ "$TRAVIS" != "true" ]; then + return; + fi # Install tox (OS X doesn't have pip). if [ $(uname -s) == "Darwin" ]; then sudo easy_install tox |