diff options
| author |   Paul Vaduva <Paul.Vaduva@enea.com> | 2017-03-17 15:25:23 +0100 |
|---|---|---|
| committer |   Jing Lu <lvjing5@huawei.com> | 2017-03-21 06:43:15 +0000 |
| commit | 2e648c83e84fd5b73b65ffcf5b81e877cd6664cd (patch) | |
| tree | 23a9c91d7935952e2ba38fbc46356bcdca8a38fd /docker/Dockerfile | |
| parent | 4e7f3a9419f135bff9bc6a3d7f6e67401b33beeb (diff) | |
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 <Paul.Vaduva@enea.com>
(cherry picked from commit 9d9925c30e9c7ad477041c28251b411432457568)
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
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 \ |