projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Be more robust if OS ports do not exist in the model
[osm/vim-emu.git]
/
utils
/
docker
/
Dockerfile
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
index
eac132c
..
25d5337
100755
(executable)
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-25,22
+25,23
@@
# partner consortium (www.sonata-nfv.eu).
FROM ubuntu:trusty
# 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 \
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
# install containernet
-RUN apt-get install -y curl python-pip
+RUN apt-get install -y curl iptables && \
+ curl https://bootstrap.pypa.io/get-pip.py | python2
+
# install docker
RUN curl -fsSL https://get.docker.com/gpg | apt-key add -
RUN curl -fsSL https://get.docker.com/ | sh
# install docker
RUN curl -fsSL https://get.docker.com/gpg | apt-key add -
RUN curl -fsSL https://get.docker.com/ | sh
-RUN pip install -U urllib3 setuptools pyparsing docker
+RUN pip install -U urllib3 setuptools pyparsing docker
python-iptables
WORKDIR /
RUN git clone https://github.com/containernet/containernet.git
RUN containernet/util/install.sh
WORKDIR /
RUN git clone https://github.com/containernet/containernet.git
RUN containernet/util/install.sh