projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix CACERT initialization in MON devops Dockerfile
[osm/devops.git]
/
docker
/
MON
/
Dockerfile
diff --git
a/docker/MON/Dockerfile
b/docker/MON/Dockerfile
index
96e1633
..
77aa909
100644
(file)
--- a/
docker/MON/Dockerfile
+++ b/
docker/MON/Dockerfile
@@
-40,7
+40,9
@@
RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \
&& pip3 install pip==9.0.3
&& rm -rf /var/lib/apt/lists/* \
&& pip3 install pip==9.0.3
-RUN pip3 install juju
+RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
+ 'pyyaml>=5.1.2' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
+ 'paramiko' # PyNaCl
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
ARG RELEASE=ReleaseFOUR-daily
@@
-57,6
+59,10
@@
RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \
&& apt-get -y install python3-osm-common${COMMON_VERSION} \
python3-osm-mon${MON_VERSION} \
python3-n2vc${N2VC_VERSION}
&& apt-get -y install python3-osm-common${COMMON_VERSION} \
python3-osm-mon${MON_VERSION} \
python3-n2vc${N2VC_VERSION}
+
+
+RUN python3 -m pip install -U juju
+
COPY scripts/ scripts/
ENV OSMMON_MESSAGE_DRIVER kafka
COPY scripts/ scripts/
ENV OSMMON_MESSAGE_DRIVER kafka
@@
-73,6
+79,7
@@
ENV OSMMON_GLOBAL_LOGLEVEL INFO
ENV OSMMON_VCA_HOST localhost
ENV OSMMON_VCA_SECRET secret
ENV OSMMON_VCA_USER admin
ENV OSMMON_VCA_HOST localhost
ENV OSMMON_VCA_SECRET secret
ENV OSMMON_VCA_USER admin
+ENV OSMMON_VCA_CACERT cacert
ENV OSMMON_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30
ENV OSMMON_DATABASE_COMMONKEY changeme
ENV OSMMON_COLLECTOR_INTERVAL 30
ENV OSMMON_EVALUATOR_INTERVAL 30