[10/14] build/docker: install packages to run tests

Submitted by Andrey Vagin on June 1, 2018, 9:03 p.m.

Details

Message ID 20180601210304.30164-11-avagin@virtuozzo.com
State Accepted
Series "More changes to be compatible with python 3"
Headers show

Commit Message

Andrey Vagin June 1, 2018, 9:03 p.m.
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 scripts/build/Dockerfile.alpine | 6 ++++--
 scripts/build/Dockerfile.centos | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 271f492ae..a210d0662 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -33,7 +33,9 @@  RUN apk add \
 	iproute2 \
 	tar \
 	bash \
-	go
+	go \
+	e2fsprogs \
+	asciidoc xmlto
 
-RUN pip install protobuf ipaddress
+RUN pip install protobuf ipaddress junit_xml
 RUN make -C test/zdtm
diff --git a/scripts/build/Dockerfile.centos b/scripts/build/Dockerfile.centos
index 379a84596..5f8470773 100644
--- a/scripts/build/Dockerfile.centos
+++ b/scripts/build/Dockerfile.centos
@@ -24,10 +24,14 @@  RUN yum install -y \
 	python \
 	python-ipaddress \
 	python2-future \
+	python2-junit_xml \
 	python-yaml \
 	python-six \
 	tar \
-	which
+	which \
+	e2fsprogs \
+	python2-pip \
+	asciidoc xmlto
 
 COPY . /criu
 WORKDIR /criu

Comments

Radostin Stoyanov June 4, 2018, 6:30 a.m.
On 01/06/18 22:03, Andrei Vagin wrote:
> +	python2-pip \
Do we need to install pip in this case?
Andrey Vagin June 4, 2018, 6:38 p.m.
On Mon, Jun 04, 2018 at 07:30:58AM +0100, Radostin Stoyanov wrote:
> On 01/06/18 22:03, Andrei Vagin wrote:
> > +	python2-pip \
> Do we need to install pip in this case?

[avagin@laptop criu]$ git grep "pip.*install"
...
scripts/travis/travis-tests:    pip install junit-xml future ipaddress
scripts/travis/travis-tests:pip install flake8