aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKubi <jean.gaoliang@huawei.com>2017-03-21 04:37:26 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-21 04:37:26 +0000
commited9954eaa6f5c3d7283bd07953163b3465ee041e (patch)
tree67227c6e158e2ad859a426520964a841f5a60c22
parentad52d92090aa23adbd1a6785e5fdb565bb2ab130 (diff)
parent9d9925c30e9c7ad477041c28251b411432457568 (diff)
Merge "Dockerfile: Use qemu-user-static from xenial "
-rw-r--r--docker/Dockerfile4
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 \