aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools
diff options
context:
space:
mode:
authorGravatar Alex Polcyn <apolcyn@google.com>2018-06-14 06:44:56 +0000
committerGravatar Alex Polcyn <apolcyn@google.com>2018-06-14 06:44:56 +0000
commitf3fb98e75fc09a4cfcb8e78bbe9a31129689b30f (patch)
tree0f14368ddf335563f61bbb735cb2af6ec91e0bde /templates/tools
parent9a2c0a8641d1837185a60436adf9419209f89fbe (diff)
Install pyyaml through pip in docker
Diffstat (limited to 'templates/tools')
-rw-r--r--templates/tools/dockerfile/apt_get_basic.include1
-rw-r--r--templates/tools/dockerfile/python_deps.include2
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