projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes Bug 1275 and Bug 1273 - aiokafka version freeze 0.6.0
[osm/devops.git]
/
docker
/
NBI
/
Dockerfile
diff --git
a/docker/NBI/Dockerfile
b/docker/NBI/Dockerfile
index
094d029
..
d115e08
100644
(file)
--- a/
docker/NBI/Dockerfile
+++ b/
docker/NBI/Dockerfile
@@
-18,18
+18,18
@@
# This creates osm/NBI docker from local NBI source code
# This creates osm/NBI docker from local NBI source code
-FROM ubuntu:1
6
.04
+FROM ubuntu:1
8
.04
-RUN apt-get update && apt-get -y install curl software-properties-common
+RUN apt-get update &&
DEBIAN_FRONTEND=noninteractive
apt-get -y install curl software-properties-common
-RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
+RUN apt-get update &&
DEBIAN_FRONTEND=noninteractive
apt-get install -y git python3 python3-jsonschema \
python3-pymongo python3-yaml python3-pip python3-keystoneclient \
&& pip3 install -U pip \
python3-pymongo python3-yaml python3-pip python3-keystoneclient \
&& pip3 install -U pip \
- && python3 -m pip install aiokafka
aiohttp cherrypy==18.0.0
pyangbind keystoneauth1 \
+ && python3 -m pip install aiokafka
==0.6.0 aiohttp cherrypy==18.1.2
pyangbind keystoneauth1 \
&& mkdir -p /app/storage/kafka && mkdir -p /app/log
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
&& mkdir -p /app/storage/kafka && mkdir -p /app/log
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=Release
FOUR
-daily
+ARG RELEASE=Release
EIGHT
-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
@@
-65,6
+65,8
@@
VOLUME /app/log
# server
ENV OSMNBI_SOCKET_HOST 0.0.0.0
ENV OSMNBI_SOCKET_PORT 9999
# server
ENV OSMNBI_SOCKET_HOST 0.0.0.0
ENV OSMNBI_SOCKET_PORT 9999
+ENV OSMNBI_SERVER_SSL_CERTIFICATE /app/osm_nbi/http/cert.pem
+ENV OSMNBI_SERVER_SSL_PRIVATE_KEY /app/osm_nbi/http/privkey.pem
# storage
ENV OSMNBI_STORAGE_PATH /app/storage
# database
# storage
ENV OSMNBI_STORAGE_PATH /app/storage
# database
@@
-75,9
+77,6
@@
ENV OSMNBI_DATABASE_URI mongodb://mongo:27017
# web
ENV OSMNBI_STATIC_DIR /app/osm_nbi/html_public
# web
ENV OSMNBI_STATIC_DIR /app/osm_nbi/html_public
-# logs
-ENV OSMNBI_LOG_FILE /app/log
-ENV OSMNBI_LOG_LEVEL DEBUG
# message
ENV OSMNBI_MESSAGE_DRIVER kafka
ENV OSMNBI_MESSAGE_HOST kafka
# message
ENV OSMNBI_MESSAGE_DRIVER kafka
ENV OSMNBI_MESSAGE_HOST kafka
@@
-103,4
+102,5
@@
HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1
# Run app.py when the container launches
CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1
# Run app.py when the container launches
-CMD ["python3", "/usr/lib/python3/dist-packages/osm_nbi/nbi.py"]
+CMD python3 -m osm_nbi.nbi
+