projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed outdated zerorpc API.
[osm/vim-emu.git]
/
utils
/
docker
/
Dockerfile
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
index
238ed44
..
1614793
100755
(executable)
--- a/
utils/docker/Dockerfile
+++ b/
utils/docker/Dockerfile
@@
-25,24
+25,24
@@
# 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 && \
+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
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
-RUN pip install -U urllib3 setuptools pyparsing docker
+RUN pip install -U urllib3==1.21.1
+RUN pip install -U 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
@@
-52,7
+52,7
@@
RUN make develop
# install son-emu
RUN echo 'install son-emu'
RUN apt-get install -y python-dev python-zmq libzmq-dev libffi-dev libssl-dev
# install son-emu
RUN echo 'install son-emu'
RUN apt-get install -y python-dev python-zmq libzmq-dev libffi-dev libssl-dev
-RUN pip install -U
zerorpc
tabulate argparse networkx six ryu oslo.config pytest Flask flask_restful requests prometheus_client pyaml
+RUN pip install -U tabulate argparse networkx six ryu oslo.config pytest Flask flask_restful requests prometheus_client pyaml
WORKDIR /
#avoid pulling not the latest git, copy the current dir, to run this from Jenkins
#RUN git clone https://github.com/sonata-nfv/son-emu.git
WORKDIR /
#avoid pulling not the latest git, copy the current dir, to run this from Jenkins
#RUN git clone https://github.com/sonata-nfv/son-emu.git
@@
-65,5
+65,5
@@
RUN echo 'Done'
ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
-# dummy GK, cAdvisor, Prometheus Push Gateway, son-emu REST API
-EXPOSE 5000 8081 9091 5001
+# dummy GK, cAdvisor, Prometheus Push Gateway, son-emu REST API
, OpenStack-fake APIs
+EXPOSE 5000 8081 9091 5001
4000 10243 9005 6001 9775 10697