projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing bug 1437
[osm/RO.git]
/
Dockerfile-local
diff --git
a/Dockerfile-local
b/Dockerfile-local
index
b99a090
..
72b28ce
100644
(file)
--- a/
Dockerfile-local
+++ b/
Dockerfile-local
@@
-20,6
+20,7
@@
LABEL authors="Alfonso Tierno"
RUN apt-get update && apt-get install -y git python3 python3-pip \
&& python3 -m pip install --upgrade pip \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev libmysqlclient-dev mysql-client \
RUN apt-get update && apt-get install -y git python3 python3-pip \
&& python3 -m pip install --upgrade pip \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev libmysqlclient-dev mysql-client \
+ build-essential libffi-dev cargo \
&& DEBIAN_FRONTEND=noninteractive python3 -m pip install -U networking-l2gw \
&& DEBIAN_FRONTEND=noninteractive python3 -m pip install -U progressbar pyvmomi pyvcloud==19.1.1 \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install genisoimage
&& DEBIAN_FRONTEND=noninteractive python3 -m pip install -U networking-l2gw \
&& DEBIAN_FRONTEND=noninteractive python3 -m pip install -U progressbar pyvmomi pyvcloud==19.1.1 \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install genisoimage
@@
-30,10
+31,9
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3-neutronclient pyt
python3-requests python3-netaddr python3-argcomplete curl \
&& DEBIAN_FRONTEND=noninteractive curl -Lo /tmp/libzenohc.so https://github.com/eclipse-fog05/fog05/releases/download/v0.1.0/libzenohc.so \
&& mv /tmp/libzenohc.so /usr/local/lib/libzenohc.so \
python3-requests python3-netaddr python3-argcomplete curl \
&& DEBIAN_FRONTEND=noninteractive curl -Lo /tmp/libzenohc.so https://github.com/eclipse-fog05/fog05/releases/download/v0.1.0/libzenohc.so \
&& mv /tmp/libzenohc.so /usr/local/lib/libzenohc.so \
- && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U jsonrpclib-pelix cvprac \
- "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im" "azure==4.0.0" boto \
+ && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U jsonrpclib-pelix cvprac "azure==4.0.0" boto \
pyone "oca @ git+https://github.com/python-oca/python-oca#egg=oca" \
pyone "oca @ git+https://github.com/python-oca/python-oca#egg=oca" \
- pyangbind sphinx zenoh==0.3.0 yaks==0.3.0.post1 fog05-sdk==0.2.0 fog05==0.2.0
+ pyangbind sphinx zenoh==0.3.0 yaks==0.3.0.post1 fog05-sdk==0.2.0 fog05==0.2.0
"cryptography>=2.5"
# DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \
# DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \
@@
-45,11
+45,7
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3-neutronclient pyt
COPY . /root/RO
COPY . /root/RO
-RUN /root/RO/RO/osm_ro/scripts/install-osm-im.sh --develop && \
- mkdir -p /var/log/osm && \
- python3 -m pip install -e /root/RO/RO-plugin && \
- python3 -m pip install -e /root/RO/RO && \
- python3 -m pip install -e /root/RO/RO-client && \
+RUN python3 -m pip install -e /root/RO/RO-plugin && \
python3 -m pip install -e /root/RO/NG-RO && \
python3 -m pip install -e /root/RO/RO-VIM-vmware && \
python3 -m pip install -e /root/RO/RO-VIM-openstack && \
python3 -m pip install -e /root/RO/NG-RO && \
python3 -m pip install -e /root/RO/RO-VIM-vmware && \
python3 -m pip install -e /root/RO/RO-VIM-openstack && \
@@
-88,7
+84,7
@@
ENV OSMRO_MESSAGE_PORT 9092
# logs
ENV OSMRO_LOG_LEVEL DEBUG
# logs
ENV OSMRO_LOG_LEVEL DEBUG
-CMD
python3 -m osm_ng_ro.ro_main
+CMD
["python3", "-u", "-m", "osm_ng_ro.ro_main"]
# HEALTHCHECK --start-period=30s --interval=10s --timeout=5s --retries=12 \
# CMD curl --silent --fail http://localhost:9090/ro || exit 1
# HEALTHCHECK --start-period=30s --interval=10s --timeout=5s --retries=12 \
# CMD curl --silent --fail http://localhost:9090/ro || exit 1