diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-06-18 16:03:59 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-18 16:03:59 +0200 |
| commit | e1efb43345e615ce48d63d5f4693d16beb58c837 (patch) | |
| tree | 45b874c83b985a1f4b1962614fcf45b8a0ef1667 /templates | |
| parent | 227d06e48b93501ba68cf49d5d962e6368b5e1d4 (diff) | |
Revert "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, 2 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/apt_get_basic.include b/templates/tools/dockerfile/apt_get_basic.include index 2825ad0048..6e19e65157 100644 --- a/templates/tools/dockerfile/apt_get_basic.include +++ b/templates/tools/dockerfile/apt_get_basic.include @@ -23,6 +23,7 @@ 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 4708094d24..c7bf238b5a 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 pyyaml==3.12 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 |