Merge "Add NUMA pinning support for node context" into stable/danube

[yardstick.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 23afef7..a1b88fe 100644 (file)
--- 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 \
@@ -41,6 +43,7 @@ RUN apt-get update && apt-get install -y \
     kpartx \
     libffi-dev \
     libssl-dev \
+    libzmq-dev \
     python \
     python-dev \
     libxml2-dev \