diff options
| author | apolcyn <apolcyn@google.com> | 2018-06-14 19:54:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 19:54:57 -0700 |
| commit | ce62e20fdc4057fc56e29842810ff2199f93a36c (patch) | |
| tree | 5409e8b5a699a526a2e3a3e2074ddd7e70c44a41 /templates | |
| parent | 1c6d6ba851b6d65ce8757b468b21b0235f9b5312 (diff) | |
| parent | f3fb98e75fc09a4cfcb8e78bbe9a31129689b30f (diff) | |
| download | grpc-grpc-ce62e20fdc4057fc56e29842810ff2199f93a36c.tar.gz | |
Merge pull request #15778 from apolcyn/use_pyyaml
Install pyyaml through pip in docker
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/tools/dockerfile/apt_get_basic.include | 1 | ||||
| -rw-r--r-- | templates/tools/dockerfile/python_deps.include | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/apt_get_basic.include b/templates/tools/dockerfile/apt_get_basic.include index 6e19e65157..2825ad0048 100644 --- a/templates/tools/dockerfile/apt_get_basic.include +++ b/templates/tools/dockerfile/apt_get_basic.include @@ -23,7 +23,6 @@ RUN apt-get update && apt-get install -y ${'\\'} strace ${'\\'} python-dev ${'\\'} python-setuptools ${'\\'} - python-yaml ${'\\'} telnet ${'\\'} unzip ${'\\'} wget ${'\\'} diff --git a/templates/tools/dockerfile/python_deps.include b/templates/tools/dockerfile/python_deps.include index c7bf238b5a..4708094d24 100644 --- a/templates/tools/dockerfile/python_deps.include +++ b/templates/tools/dockerfile/python_deps.include @@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y ${'\\'} # Install Python packages from PyPI RUN pip install --upgrade pip==10.0.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 pyyaml==3.12 |