aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2017-05-03 07:17:18 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2017-05-03 07:17:18 +0300
commit1b3eadac1a0ac5e7104f092aa356c2000690f8bf (patch)
treed24e4fb4a1e826c7261dad9860ae4b65503b3d3a
parentacecc987f138fb0173c881df56114795b9bc0af2 (diff)
{trusty,xenial}-*-tcwg-base: fix virtualenv package name
virtualenv exists only in xenial and depends on python3-virtualenv. Use python-virtualenv instead, which exists in both trusty and xenial. Change-Id: Icbcbdeb7250b2286d72751491ccd145a6fea9f94 Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r--trusty-amd64-tcwg-base/Dockerfile2
-rw-r--r--trusty-arm64-tcwg-base/Dockerfile2
-rw-r--r--trusty-armhf-tcwg-base/Dockerfile2
-rw-r--r--trusty-i386-tcwg-base/Dockerfile2
-rw-r--r--xenial-amd64-tcwg-base/Dockerfile2
-rw-r--r--xenial-arm64-tcwg-base/Dockerfile2
-rw-r--r--xenial-armhf-tcwg-base/Dockerfile2
-rw-r--r--xenial-i386-tcwg-base/Dockerfile2
8 files changed, 8 insertions, 8 deletions
diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile
index da792625..1eb4a92a 100644
--- a/trusty-amd64-tcwg-base/Dockerfile
+++ b/trusty-amd64-tcwg-base/Dockerfile
@@ -60,6 +60,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
openssh-server \
pkg-config \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -72,7 +73,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
wine \
xz-utils \
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile
index 94419cce..e00e0904 100644
--- a/trusty-arm64-tcwg-base/Dockerfile
+++ b/trusty-arm64-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
openjdk-7-jdk \
openssh-server \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -66,7 +67,6 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
xz-utils \
zip \
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile
index 6cb8de40..b6552fdd 100644
--- a/trusty-armhf-tcwg-base/Dockerfile
+++ b/trusty-armhf-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
openjdk-7-jdk \
openssh-server \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -66,7 +67,6 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
xz-utils \
zip \
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index f55a769c..dea078e5 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -61,6 +61,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
openssh-server \
pkg-config \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -73,7 +74,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
wine \
xz-utils \
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index a2a1ddd1..fdbd874c 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -59,6 +59,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
openssh-server \
pkg-config \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -71,7 +72,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
wine \
xz-utils \
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index ad72f922..75043490 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
openjdk-8-jdk \
openssh-server \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -66,7 +67,6 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
xz-utils \
zip \
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index 98c7cfe2..9905d072 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
openjdk-8-jdk \
openssh-server \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -66,7 +67,6 @@ RUN (url="http://ports.ubuntu.com/ubuntu-ports/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
xz-utils \
zip \
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index 44b45d24..98db956e 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -60,6 +60,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
openssh-server \
pkg-config \
python-dev \
+ python-virtualenv \
pxz \
qemu-user \
rsync \
@@ -72,7 +73,6 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
time \
valgrind \
vim \
- virtualenv \
wget \
wine \
xz-utils \