X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=5f2078eb9e8c50b8e988c6e28be00b68bb5e5a68;hp=25d53379396083c687909a8a2c9f3ec1e7394f7f;hb=bbe128904ab07e43a0386f17a500c679ff9059e0;hpb=807be58fa7a13781cdd895a9ab4694c426c00395 diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile index 25d5337..5f2078e 100755 --- a/utils/docker/Dockerfile +++ b/utils/docker/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION] +# Neither the name of the SONATA-NFV, Paderborn University # nor the names of its contributors may be used to endorse or promote # products derived from this software without specific prior written # permission. @@ -41,7 +41,8 @@ RUN apt-get install -y curl iptables && \ 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 python-iptables +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 @@ -50,8 +51,8 @@ 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 -RUN pip install -U zerorpc tabulate argparse networkx six ryu oslo.config pytest Flask flask_restful requests prometheus_client pyaml +RUN apt-get install -y python-dev libffi-dev libssl-dev +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 @@ -64,5 +65,5 @@ RUN echo 'Done' 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