From f3fb98e75fc09a4cfcb8e78bbe9a31129689b30f Mon Sep 17 00:00:00 2001
From: Alex Polcyn <apolcyn@google.com>
Date: Thu, 14 Jun 2018 06:44:56 +0000
Subject: Install pyyaml through pip in docker

---
 templates/tools/dockerfile/apt_get_basic.include | 1 -
 templates/tools/dockerfile/python_deps.include   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'templates/tools')

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
-- 
cgit v1.2.3