X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile.local;h=4e0ee05509799611d224d0fa7ab0667edc6ceecc;hb=62b2cd737713afe8cf2e169047f08f4d507e3d61;hp=64036b8a9649670b784717da058bf6149ebb5d93;hpb=f7e0a648a319dd744df5d650023eab774ebfcdbb;p=osm%2FLCM.git

diff --git a/Dockerfile.local b/Dockerfile.local
index 64036b8..4e0ee05 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -16,22 +16,22 @@
 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 git tox python3 \
-    python3-pip python3-aiohttp \
-    && pip3 install pip==9.0.3 \
-    && pip3 install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
+    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 \
-    && pip3 install -e /app/N2VC \
-    && pip3 install -e /app/N2VC/modules/libjuju \
+    && 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 -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
-    && pip3 install -e /app/common
+    && python3 -m pip install -e /app/common
     #  python3-pymongo python3-yaml pycrypto aiokafka
 
 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
@@ -57,6 +57,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
@@ -82,7 +84,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