Fix docker files, distrib test script

pull/5092/head
Craig Tiller 9 years ago
parent a7f3e05760
commit 6b5555ead1
  1. 17
      test/distrib/python/run_distrib_test.sh
  2. 5
      tools/dockerfile/distribtest/python_arch_x64/Dockerfile
  3. 2
      tools/dockerfile/distribtest/python_centos6_x64/Dockerfile

@ -42,16 +42,17 @@ then
exit 1
fi
# TODO(jtattermusch): this shouldn't be required
pip install --upgrade six
PIP=pip2
which $PIP || PIP=pip
PYTHON=python2
which $PYTHON || PYTHON=python
# TODO(jtattermusch): if these don't get preinstalled, pip tries to install them
# with --use-grpc-custom-bdist option, which obviously fails.
pip install --upgrade enum34
pip install --upgrade futures
# TODO(jtattermusch): this shouldn't be required
$PIP install --upgrade six
GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \
pip install \
$PIP install \
"${SDIST_ARCHIVE}"
python distribtest.py
$PYTHON distribtest.py

@ -31,6 +31,7 @@ FROM base/archlinux
RUN pacman --noconfirm -Syy
RUN pacman --noconfirm -S git
RUN pacman --noconfirm -S python
RUN pacman --noconfirm -S python-pip
RUN pacman --noconfirm -S openssl
RUN pacman --noconfirm -S python2
RUN pacman --noconfirm -S python2-pip

@ -35,3 +35,5 @@ RUN yum install -y python
RUN rpm -ivh http://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
RUN yum install -y python-pip
RUN pip install --upgrade pip

Loading…
Cancel
Save