X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=6675a993ff899c4db34c60550f2f4c9962e962cf;hb=6a70374d7269d181af98c392eba116abb70ee1e9;hp=72d6a86355e0cf78a1ecd6bda00fa59ea02504c7;hpb=5311973b3bd700aa661d3f44607960919b387462;p=osm%2Fdevops.git

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 72d6a863..6675a993 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -18,7 +18,7 @@
 
 # This creates som/LCM docker from from last stable package
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Set the working directory to /app
 WORKDIR /app/osm_lcm
@@ -39,45 +39,52 @@ APT::AutoRemove::SuggestsImportant "false";\n'\
 
 RUN apt-get update && apt-get -y install curl software-properties-common
 
-RUN apt-get update && apt-get install -y git make python3 \
-    python3-pip python3-pymongo python3-yaml python3-aiohttp \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make python3 \
+    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 \
-    && pip3 install -U pip \
-    && python3 -m pip install -U aiokafka pyang lxml six enum34 \
-    && python3 -m pip install websockets==4.0.1 \
-    && python3 -m pip install requests \
+    wget tox python3-cffi \
+    && python3 -m pip install -U pip \
+    && python3 -m pip install -U juju==2.8.2 \
     && rm -rf /var/lib/apt/lists/*
 
-# packages needed for N2VC because deb dependencies are not fine
-RUN python3 -m pip install  'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
-      'pyyaml>=3.0,<4.0' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
-      'paramiko'   # PyNaCl
-# 
 # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
 #     && cd N2VC \
 #     && cd modules/libjuju && python3 setup.py develop && cd ../.. \
 #     && python3 -m pip install -U -r requirements.txt
 
+RUN apt-get update && apt-get install -y curl xz-utils apt-transport-https \
+    && curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
+    && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
+    && apt-get update && apt-get install -y kubectl
+
+RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15.2.tar.gz \
+    && tar -zxvf helm-v2.15.2.tar.gz \
+    && mv linux-amd64/helm /usr/local/bin/helm \
+    && rm -r linux-amd64/
+
+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=ReleaseFOUR-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 
 RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
 RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} LCM N2VC common" && apt update
 
+RUN python3 -m pip install -U "cffi==1.13.2"
+
 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" \
@@ -96,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
@@ -115,9 +126,19 @@ ENV OSMLCM_MESSAGE_DRIVER  kafka
 ENV OSMLCM_MESSAGE_HOST    kafka
 ENV OSMLCM_MESSAGE_PORT    9092
 
-HEALTHCHECK --interval=30s --timeout=140s --retries=1 \
-  CMD python3 /usr/lib/python3/dist-packages/osm_lcm/lcm.py --health-check || exit 1
+# k8s
+ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm
+ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
+ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
+
+# logs
+# ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
+# ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
+
+HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
+  CMD python3 -m osm_lcm.lcm_hc || exit 1
 
 
 # Run app.py when the container launches
-CMD ["python3", "/usr/lib/python3/dist-packages/osm_lcm/lcm.py"]
+CMD python3 -m osm_lcm.lcm
+