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: Fixed version of tinyrpc to not break the Ryu installation.
[osm/vim-emu.git]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
d603a5d
..
38adc2a
100755
(executable)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-27,6
+27,7
@@
FROM ubuntu:xenial
ENV SON_EMU_IN_DOCKER 1
FROM ubuntu:xenial
ENV SON_EMU_IN_DOCKER 1
+ENV PIP_DEFAULT_TIMEOUT=100
# install required packages
RUN apt-get clean
# install required packages
RUN apt-get clean
@@
-43,9
+44,12
@@
RUN apt-get update \
curl \
iptables \
iputils-ping \
curl \
iptables \
iputils-ping \
- sudo
+ sudo \
+ vim
# install containernet (using its Ansible playbook)
# 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
RUN git clone https://github.com/containernet/containernet.git
WORKDIR /containernet/ansible
RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.yml
@@
-57,11
+61,15
@@
RUN ansible-playbook -i "localhost," -c local --skip-tags "notindocker" install.
WORKDIR /son-emu
RUN python setup.py develop
WORKDIR /son-emu
RUN python setup.py develop
-WORKDIR /
+# Hotfix: https://github.com/pytest-dev/pytest/issues/4770
+RUN pip2 install "more-itertools<=5.0.0"
+
+# Hotfix: Do not use latest tinyrpc lib, since it breaks Ryu
+RUN pip2 install "tinyrpc==1.0.3"
# Important: This entrypoint is required to start the OVS service
ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
# Important: This entrypoint is required to start the OVS service
ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
-CMD ["python", "
son-emu/
examples/default_single_dc_topology.py"]
+CMD ["python", "examples/default_single_dc_topology.py"]
# open ports for emulator APIs
# SONATA GK
# open ports for emulator APIs
# SONATA GK