X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile.local;h=64036b8a9649670b784717da058bf6149ebb5d93;hb=7c76ad9242e92a917b700db41e044982666c9bda;hp=5ff0fecd275982b34946e0cc71784cb7a73777a9;hpb=8d9500120b991ed3da532fa37bffb237835a2e13;p=osm%2FLCM.git

diff --git a/Dockerfile.local b/Dockerfile.local
index 5ff0fec..64036b8 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,32 +1,38 @@
+# Copyright 2018 Telefonica S.A.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM ubuntu:16.04
 
 # Set the working directory to /app
-WORKDIR /app/osm_lcm
-
-# Copy the current directory contents into the container at /app
-ADD . /app
+WORKDIR /app/LCM/osm_lcm
 
-RUN apt-get update && apt-get install -y git python3 \
-    python3-pip python3-pymongo python3-yaml python3-aiohttp \
-    python3-stdeb python3-setuptools python3-all python-all \
-    python3-bitarray python3-regex python3-lxml debhelper dh-python tox wget \
-    python3-cffi \
+RUN apt-get update && apt-get install -y git tox python3 \
+    python3-pip python3-aiohttp \
     && pip3 install pip==9.0.3 \
-    && pip3 install -U aiokafka pyang lxml six enum34
-
-RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
-    && cd N2VC \
-    && pip3 install websockets==4.0.1 \
-    && pip3 install requests \
-    && cd modules/libjuju && python3 setup.py develop && cd ../.. \
-    && pip3 install -U -r requirements.txt \
-    && python3 setup.py develop \
-    && cd ..
-
-RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
-    && cd common  && python3 setup.py develop && cd ..
-#    && pip3 install -U -r requirements.txt \
-#    && cd ..
+    && pip3 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 \
+    && 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-pymongo python3-yaml pycrypto aiokafka
 
 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
 
@@ -54,8 +60,12 @@ ENV OSMLCM_VCA_SECRET:     secret
 
 # 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
+
+#storage
 ENV OSMLCM_STORAGE_DRIVER  local
 ENV OSMLCM_STORAGE_PATH    /app/storage
 
@@ -65,8 +75,14 @@ ENV OSMLCM_MESSAGE_HOST    kafka
 ENV OSMLCM_MESSAGE_PORT    9092
 
 # logs
-ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
+# ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
 ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 
+# Copy the current directory contents into the container at /app/LCM
+ADD . /app/LCM
+
 # Run app.py when the container launches
 CMD ["python3", "lcm.py"]
+
+# HEALTHCHECK --interval=30 --timeout=140 --retries=1 \
+#     CMD python3 lcm.py --health-check || exit 1