Merge "test_vnf_generic: fix unitests when files are present"

[yardstick.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3dd9401..afb2ce5 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && apt-get install -y \
     kpartx \
     libffi-dev \
     libssl-dev \
+    libzmq-dev \
     python \
     python-dev \
     libxml2-dev \
@@ -50,7 +51,7 @@ RUN apt-get update && apt-get install -y \
     uwsgi-plugin-python \
     supervisor \
     python-setuptools && \
-    easy_install -U setuptools
+    easy_install -U setuptools==30.0.0
 
 RUN apt-get -y autoremove && \
     apt-get clean