X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile.local;h=772af7af7cf96aafa31e6785cf3fd4319f5f62bd;hb=refs%2Fheads%2Ffeature7928;hp=07c0f2e1a2afefbd5ab4e5b43ba0624eed5c0987;hpb=2b611ddf79e7e2b1c3d6f53b0e966da8a4e6a219;p=osm%2FLCM.git

diff --git a/Dockerfile.local b/Dockerfile.local
index 07c0f2e..772af7a 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -16,7 +16,18 @@
 FROM ubuntu:16.04
 
 # Set the working directory to /app
-WORKDIR /app/LCM/osm_lcm
+WORKDIR /app/LCM
+
+RUN apt-get update && apt-get install -y curl \
+    && apt-get update && apt-get install -y 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 apt-get update && apt-get install -y git tox python3 \
     python3-pip python3-aiohttp python3-jinja2 \
@@ -24,6 +35,8 @@ RUN apt-get update && apt-get install -y git tox python3 \
     && pip3 install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
 
 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \
+    && git -C /app/N2VC fetch "https://osm.etsi.org/gerrit/osm/N2VC" refs/changes/56/8156/1 \
+    && git -C /app/N2VC checkout FETCH_HEAD \
     && pip3 install -e /app/N2VC \
     && pip3 install -e /app/N2VC/modules/libjuju \
     && apt-get install -y libffi-dev libssl-dev openssh-client
@@ -57,6 +70,8 @@ ENV OSMLCM_VCA_HOST        vca
 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
 
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo
@@ -74,6 +89,10 @@ ENV OSMLCM_MESSAGE_DRIVER  kafka
 ENV OSMLCM_MESSAGE_HOST    kafka
 ENV OSMLCM_MESSAGE_PORT    9092
 
+# k8s
+ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm
+ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
+
 # logs
 # ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
 ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
@@ -82,7 +101,7 @@ ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 ADD . /app/LCM
 
 # Run app.py when the container launches
-CMD ["python3", "lcm.py"]
+CMD python3 -m osm_lcm.lcm
 
-# HEALTHCHECK --interval=30 --timeout=140 --retries=1 \
-#     CMD python3 lcm.py --health-check || exit 1
+# HEALTHCHECK --interval=120s --timeout=15s --retries=1 \
+#     CMD python3 -m osm_lcm.lcm --health-check || exit 1