From 9d9925c30e9c7ad477041c28251b411432457568 Mon Sep 17 00:00:00 2001 From: Paul Vaduva Date: Fri, 17 Mar 2017 15:25:23 +0100 Subject: Dockerfile: Use qemu-user-static from xenial qemu-user-static from Trusty crashes when ssl is used in chroot. JIRA: YARDSTICK-592 Change-Id: I81e8f04d7469082ceb6512cb09e11dfa672e5e98 Signed-off-by: Paul Vaduva --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index afb2ce5c6..a1b88fe69 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,7 +21,9 @@ ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN sed -i -e 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list RUN sed -i -e 's/^deb-src /# deb-src /g' /etc/apt/sources.list +RUN echo "APT::Default-Release \"trusty\";" > /etc/apt/apt.conf.d/default-distro RUN echo "\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ xenial-updates universe \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-security main universe multiverse restricted \n\ @@ -30,7 +32,7 @@ RUN echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf RUN dpkg --add-architecture arm64 RUN apt-get update && apt-get install -y \ - qemu-user-static \ + qemu-user-static/xenial \ libc6:arm64 \ wget \ expect \ -- cgit 1.2.3-korg