Install Python deps in Docker image.

pull/1295/head
Josh Haberman 9 years ago
parent 0b931bcd53
commit 483533d3a2
  1. 26
      tools/docker/Dockerfile
  2. 9
      tools/run_tests/jenkins.sh
  3. 3
      tools/run_tests/tests.sh

@ -30,6 +30,10 @@
# Base Dockerfile for gRPC dev images # Base Dockerfile for gRPC dev images
FROM debian:latest 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 # Install dependencies. We start with the basic ones require to build protoc
# and the C++ build # and the C++ build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@ -48,19 +52,19 @@ RUN apt-get update && apt-get install -y \
libtool \ libtool \
make \ make \
parallel \ parallel \
strace \ # -- For all Java builds -- \
python-dev \
python-setuptools \
telnet \
unzip \
wget \
zip \
# For all Java builds \
maven \ maven \
# For java_jdk6 \ # -- For java_jdk6 -- \
# oops! not in Jessie. Too old? openjdk-6-jdk \ # oops! not in jessie. too old? openjdk-6-jdk \
# For java_jdk7 \ # -- For java_jdk7 -- \
openjdk-7-jdk \ 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 && apt-get clean
# Prepare ccache # Prepare ccache

@ -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 # Other tests are run in parallel. The overall run fails if any one of them
# fails. # fails.
# java_jdk6 parallel $TEST_SCRIPT ::: \
parallel $TEST_SCRIPT ::: java_jdk7 javanano_jdk7 java_jdk7 \
javanano_jdk7 \
python \
python_cpp
# java_jdk6 \

@ -152,6 +152,9 @@ build_javanano_oracle7() {
} }
internal_install_python_deps() { internal_install_python_deps() {
if [ "$TRAVIS" != "true" ]; then
return;
fi
# Install tox (OS X doesn't have pip). # Install tox (OS X doesn't have pip).
if [ $(uname -s) == "Darwin" ]; then if [ $(uname -s) == "Darwin" ]; then
sudo easy_install tox sudo easy_install tox

Loading…
Cancel
Save