X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Dockerfile;h=81aa58769138f47973d4e6ddb5265ad63ee25f59;hb=619e6b39eb58b77f4ff501f7879e9cfe2ff49701;hp=a823cdad172a9a6d141290fdfe90715a912dc664;hpb=447d457169b3d8b673b147bdf0ab44bf1bbbe45e;p=osm%2Fvim-emu.git

diff --git a/Dockerfile b/Dockerfile
old mode 100755
new mode 100644
index a823cda..81aa587
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,49 +24,31 @@
 # acknowledge the contributions of their colleagues of the SONATA
 # partner consortium (www.sonata-nfv.eu).
 
-FROM ubuntu:xenial
+FROM containernet/containernet:latest
 
 ENV SON_EMU_IN_DOCKER 1
 ENV PIP_DEFAULT_TIMEOUT=100
 
-# install required packages
-RUN apt-get clean
-RUN apt-get update \
-    && apt-get install -y  git \
-    net-tools \
-    aptitude \
-    build-essential \
-    python-setuptools \
-    python-dev \
-    python-pip \
-    software-properties-common \
-    ansible \
-    curl \
-    iptables \
-    iputils-ping \
-    sudo \
-    vim
-
-# install containernet (using its Ansible playbook)
-#RUN git clone https://github.com/containernet/containernet.git && \
-#    (cd containernet && git checkout 6fcee82e192c8c0e6447650d6f512842185529ee)
-RUN git clone https://github.com/containernet/containernet.git
-WORKDIR /containernet/ansible
-RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
-
 # install emulator (using its Ansible playbook)
-COPY . /son-emu
-WORKDIR /son-emu/ansible
+WORKDIR /
+COPY . /vim-emu
+WORKDIR /vim-emu/ansible
 RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
-WORKDIR /son-emu
-RUN python setup.py develop
+WORKDIR /vim-emu
+RUN python3 setup.py develop
+
+# Hotfix: Do not use latest tinyrpc lib, since it breaks Ryu
+RUN pip3 install "tinyrpc==1.0.3"
+RUN pip3 install wheel --upgrade
 
-# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
-RUN pip2 install "more-itertools<=5.0.0"
+# Force python3
+RUN mv /usr/bin/python /usr/bin/python2 && \
+    ln -s /usr/bin/python3 /usr/bin/python && \
+    ln -s /usr/bin/pip3 /usr/bin/pip
 
 # Important: This entrypoint is required to start the OVS service
-ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
-CMD ["python", "examples/default_single_dc_topology.py"]
+ENTRYPOINT ["/vim-emu/utils/docker/entrypoint.sh"]
+CMD ["python3", "examples/default_single_dc_topology.py"]
 
 # open ports for emulator APIs
 # SONATA GK