X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile.local;h=a905732554864848031b6f90b811459255d89c4c;hb=3bedc9bf2cf602bd3a67ba699d60ea49539ae9e5;hp=df607e6cee42bea7a78105ab8423b7faa963794e;hpb=b6541cffbe081db8ad0e60b6842c47974ba33a33;p=osm%2FLCM.git

diff --git a/Dockerfile.local b/Dockerfile.local
index df607e6..a905732 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -16,25 +16,33 @@
 FROM ubuntu:16.04
 
 # Set the working directory to /app
-WORKDIR /app/osm_lcm
+WORKDIR /app/LCM
 
-# Copy the current directory contents into the container at /app
-ADD . /app
+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 \
-    && pip3 install pip==9.0.3 \
-    && pip3 install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
-
-RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
-    && pip3 install -e N2VC \
-    && pip3 install -e N2VC/modules/libjuju \
-    && apt-get install -y libffi-dev libssl-dev
+    python3-pip python3-aiohttp python3-jinja2 \
+    && python3 -m pip install pip --upgrade  \
+    && python3 -m pip install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
+
+RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \
+    && python3 -m pip install -e /app/N2VC \
+    && python3 -m pip install -U juju \
+    && apt-get install -y libffi-dev libssl-dev openssh-client
     # cd N2VC; python3 setup.py develop
     # cd modules/libjuju; python3 setup.py develop
 
-RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
-    && pip3 install -e common
+RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
+    && python3 -m pip install -e /app/common
     #  python3-pymongo python3-yaml pycrypto aiokafka
 
 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
@@ -60,14 +68,15 @@ 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
-ENV OSMLCM_DATABASE_HOST   mongo
-ENV OSMLCM_DATABASE_PORT   27017
+ENV OSMLCM_DATABASE_URI mongodb://mongo:27017
+# ENV OSMLCM_DATABASE_COMMONKEY  xxx
 # ENV OSMLCM_DATABASE_USER  xxx
 # ENV OSMLCM_DATABASE_PASSWORD  xxx
-# ENV OSMLCM_DATABASE_COMMONKEY  xxx
 
 #storage
 ENV OSMLCM_STORAGE_DRIVER  local
@@ -78,13 +87,19 @@ 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_LOGFILE  /app/log/lcm.log
 ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 
-# Run app.py when the container launches
-CMD ["python3", "lcm.py"]
+# Copy the current directory contents into the container at /app/LCM
+ADD . /app/LCM
 
-# HEALTHCHECK --interval=30 --timeout=140 --retries=1 \
-#     CMD python3 /usr/lib/python3/dist-packages/osm_lcm/lcm.py --health-check || exit 1
+# Run app.py when the container launches
+CMD python3 -m osm_lcm.lcm
 
+# HEALTHCHECK --interval=120s --timeout=15s --retries=1 \
+#     CMD python3 -m osm_lcm.lcm --health-check || exit 1