From ca164cf8efbc5d76c7c8ae25f4a3bffcb983c364 Mon Sep 17 00:00:00 2001 From: stevenvanrossem Date: Wed, 3 May 2017 16:26:01 +0200 Subject: [PATCH] update Dockerfile to fix Jenkins test --- ansible/install.yml | 3 +++ setup.py | 3 ++- utils/docker/Dockerfile | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ansible/install.yml b/ansible/install.yml index d5f00ee..fc25d48 100755 --- a/ansible/install.yml +++ b/ansible/install.yml @@ -69,5 +69,8 @@ - name: install iptc pip: name=python-iptables state=latest + - name: install ipaddress + pip: name=ipaddress state=latest + diff --git a/setup.py b/setup.py index 186356c..7e00fff 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,8 @@ setup(name='emuvim', 'docker==2.0.2', 'requests', 'prometheus_client', - 'urllib3' + 'urllib3', + 'ipaddress' ], zip_safe=False, entry_points={ diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile index df52ccc..25d5337 100755 --- a/utils/docker/Dockerfile +++ b/utils/docker/Dockerfile @@ -25,17 +25,16 @@ # partner consortium (www.sonata-nfv.eu). FROM ubuntu:trusty -MAINTAINER steven.vanrossem@intec.ugent.be ENV SON_EMU_IN_DOCKER 1 RUN apt-get clean RUN apt-get update \ - && apt-get install -y git aptitude + && apt-get install -y git aptitude build-essential python-setuptools python-dev software-properties-common # install containernet -RUN apt-get install -y curl && \ +RUN apt-get install -y curl iptables && \ curl https://bootstrap.pypa.io/get-pip.py | python2 # install docker -- 2.25.1