From 66c5aa5fbf80db98a52af72c50d4870443eaeec2 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Mon, 11 May 2020 10:46:12 -0700 Subject: [PATCH] misc: Added python-six as a dependency in 18.04 docker Previously the docker utilized Python-Pip. This is an intermediate dependency we don't need. We can install the Python-six module directly via the APT framework. Change-Id: I30e3e1cdca802ca19422140f39af7dc9dc166ed7 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28891 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile index 95923f5d9..a0064b6aa 100644 --- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile @@ -30,5 +30,4 @@ RUN apt -y update RUN apt -y upgrade RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \ - python-dev python python-pip doxygen -RUN pip install six + python-dev python python-six doxygen -- 2.30.2