From ad1a2469456e09b00a7a80ed08f8d08c7a25a49f Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 22 Sep 2019 20:37:01 +0200
Subject: Swith to coreutils timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
juju is not correctly stopped when no internet.
https://build.opnfv.org/ci/job/functest-ovn-opnfv-functest-vnf-jerma-juju_epc-run/21/console
root 1 0 0 Apr04 ? 00:00:06 /usr/bin/python3.7 /usr/bin/run_tests -t juju_epc -r -p
root 139 1 0 Apr04 ? 00:00:03 [juju] <defunct>
root 141 1 0 Apr04 ? 00:00:00 [timeout] <defunct>
Change-Id: Id06c6e829ab8a992107f655aac6ec4539e292d82
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit cda22d7db0bcca380e1caef76e171cd7753b6221)
---
docker/core/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'docker/core')
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a4f174985..540e35547 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=master
RUN apk --no-cache add --update \
python3 libffi openssl libjpeg-turbo py3-pip bash \
- grep sed wget ca-certificates git openssh-client qemu-img iputils mailcap && \
+ grep sed wget ca-certificates git openssh-client qemu-img iputils coreutils mailcap && \
apk --no-cache add --virtual .build-deps --update \
python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
--
cgit