X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=6675a993ff899c4db34c60550f2f4c9962e962cf;hb=1df265155d72cf1082c7ef9f1d8977e68ff7f327;hp=e7a86cb8a9081dad90c2d27f2bafc97841a6bc35;hpb=c196383e0bd5d6cf2d703822f488e4b107ee83a6;p=osm%2Fdevops.git

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index e7a86cb8..6675a993 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -40,14 +40,11 @@ APT::AutoRemove::SuggestsImportant "false";\n'\
 RUN apt-get update && apt-get -y install curl software-properties-common
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make python3 \
-    gpg-agent python3-pip python3-pymongo python3-aiohttp \
+    gpg-agent python3-pip  \
     python3-all python3-setuptools openssh-client libffi-dev libssl-dev \
-    python3-bitarray python3-regex python3-lxml dh-python wget tox \
-    python3-cffi \
+    wget tox python3-cffi \
     && python3 -m pip install -U pip \
-    && python3 -m pip install -U aiokafka lxml six enum34 \
-    && python3 -m pip install requests \
-    && python3 -m pip install -U juju \
+    && python3 -m pip install -U juju==2.8.2 \
     && rm -rf /var/lib/apt/lists/*
 
 # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
@@ -65,12 +62,12 @@ RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15
     && mv linux-amd64/helm /usr/local/bin/helm \
     && rm -r linux-amd64/
 
-RUN curl -L https://launchpad.net/juju/2.7/2.7.0/+download/juju-2.7.0-k8s.tar.xz --output juju-2.7.0-k8s.tar.xz \
-    && tar -xvf juju-2.7.0-k8s.tar.xz \
+RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz --output juju-2.7.6-k8s.tar.xz \
+    && tar -xvf juju-2.7.6-k8s.tar.xz \
     && mv juju /usr/local/bin/juju
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseSEVEN-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
@@ -83,12 +80,11 @@ ARG LCM_VERSION
 ARG COMMON_VERSION
 ARG N2VC_VERSION
 
-RUN apt-get update && apt-get install -y python3-osm-lcm${LCM_VERSION} \
-                                         python3-osm-common${COMMON_VERSION} \
-                                         python3-n2vc${N2VC_VERSION} \
-                                         && rm -rf /var/lib/apt/lists/*
-
-EXPOSE 9999
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+     python3-osm-lcm${LCM_VERSION} \
+     python3-osm-common${COMMON_VERSION} \
+     python3-n2vc${N2VC_VERSION} \
+     && rm -rf /var/lib/apt/lists/*
 
 LABEL Maintainer="alfonso.tiernosepulveda@telefonica.com" \
       Description="This implements life cycle management engine for OSM" \
@@ -107,9 +103,13 @@ ENV OSMLCM_RO_TENANT       osm
 
 # VCA
 ENV OSMLCM_VCA_HOST        vca
-ENV OSMLCM_VCA_PORT:       17070
-ENV OSMLCM_VCA_USER:       admin
-ENV OSMLCM_VCA_SECRET:     secret
+ENV OSMLCM_VCA_PORT       17070
+ENV OSMLCM_VCA_USER       admin
+ENV OSMLCM_VCA_SECRET     secret
+# ENV OSMLCM_VCA_PUBKEY     pubkey
+# ENV OSMLCM_VCA_CACERT     cacert
+# ENV OSMLCM_VCA_ENABLEOSUPGRADE false
+# ENV OSMLCM_VCA_APTMIRROR  http://archive.ubuntu.com/ubuntu/
 
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo
@@ -136,7 +136,7 @@ ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
 # ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 
 HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
-  CMD python3 -m osm_lcm.lcm --health-check || exit 1
+  CMD python3 -m osm_lcm.lcm_hc || exit 1
 
 
 # Run app.py when the container launches