projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finalizing Python3 migration
[osm/vim-emu.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
old mode 100755
(executable)
new mode 100644
(file)
index
b77c268
..
8e1e4e3
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-24,7
+24,7
@@
# acknowledge the contributions of their colleagues of the SONATA
# partner consortium (www.sonata-nfv.eu).
# acknowledge the contributions of their colleagues of the SONATA
# partner consortium (www.sonata-nfv.eu).
-FROM ubuntu:
xenial
+FROM ubuntu:
bionic
ENV SON_EMU_IN_DOCKER 1
ENV PIP_DEFAULT_TIMEOUT=100
ENV SON_EMU_IN_DOCKER 1
ENV PIP_DEFAULT_TIMEOUT=100
@@
-35,37
+35,47
@@
RUN apt-get update \
&& apt-get install -y git \
net-tools \
aptitude \
&& apt-get install -y git \
net-tools \
aptitude \
+ apt-utils \
build-essential \
build-essential \
- python-setuptools \
- python-dev \
- python-pip \
+ libevent-dev \
software-properties-common \
ansible \
curl \
iptables \
iputils-ping \
software-properties-common \
ansible \
curl \
iptables \
iputils-ping \
- sudo
+ sudo \
+ wget \
+ python \
+ python-pip \
+ python3 \
+ python3-dev \
+ python3-venv \
+ python3-pip
# install containernet (using its Ansible playbook)
# install containernet (using its Ansible playbook)
-# Attention: Containernet installation fixed to specific commit. Change to update to latest Containernet version.
-RUN git clone https://github.com/containernet/containernet.git && \
- (cd containernet && git checkout bc269d6f1cf9f50f71fda65c25fe1f2f4c1573b7)
+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)
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
+COPY . /
vim
-emu
+WORKDIR /
vim
-emu/ansible
RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
-WORKDIR /
son
-emu
-RUN python setup.py develop
+WORKDIR /
vim
-emu
+RUN python
3
setup.py develop
# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
-RUN pip2 install "more-itertools<=5.0.0"
+RUN pip3 install "more-itertools<=5.0.0"
+
+# Hotfix: Do not use latest tinyrpc lib, since it breaks Ryu
+RUN pip3 install "tinyrpc==1.0.3"
+
+RUN pip3 install wheel --upgrade
# Important: This entrypoint is required to start the OVS service
# 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 ["python
3
", "examples/default_single_dc_topology.py"]
# open ports for emulator APIs
# SONATA GK
# open ports for emulator APIs
# SONATA GK