X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile.local;h=737caad3839f4fbccdcb44cae720af7000b3f70e;hb=7dc946716e5fc51340e143442ce45bff8c948525;hp=9b25519f18dae1542491a5a91bc205b48379b391;hpb=ee29bc7eb31d80fd24eaa5667ccf2dad386ffdca;p=osm%2FLCM.git

diff --git a/Dockerfile.local b/Dockerfile.local
index 9b25519..737caad 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # Set the working directory to /app
 WORKDIR /app/LCM
 
-RUN apt-get update && apt-get install -y curl xz-utils \
+RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \
     && 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 \
@@ -29,14 +29,19 @@ RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15
     && mv linux-amd64/helm /usr/local/bin/helm \
     && rm -r linux-amd64/
 
-RUN curl -L https://launchpad.net/juju/2.7/2.7.0/+download/juju-2.7.0-k8s.tar.xz --output juju-2.7.0-k8s.tar.xz \
-    && tar -xvf juju-2.7.0-k8s.tar.xz \
+RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4.tar.gz \
+    && tar -zxvf helm-v3.3.4.tar.gz \
+    && mv linux-amd64/helm /usr/local/bin/helm3 \
+    && 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
 
 RUN apt-get update && apt-get install -y git tox python3 \
-    python3-pip python3-aiohttp python3-jinja2 \
+    python3-pip python3-jinja2 \
     && python3 -m pip install pip --upgrade  \
-    && python3 -m pip install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
+    && python3 -m pip install -U 'PyYAML' 'aiohttp>=2.3.10' flake8
 
 RUN git -C /app clone https://osm.etsi.org/gerrit/osm/N2VC.git \
     && python3 -m pip install -e /app/N2VC \
@@ -49,6 +54,8 @@ 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 python3 -m pip install grpcio-tools grpclib
+
 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
 
 
@@ -72,11 +79,17 @@ ENV OSMLCM_VCA_HOST        vca
 ENV OSMLCM_VCA_PORT        17070
 ENV OSMLCM_VCA_USER        admin
 ENV OSMLCM_VCA_SECRET      secret
+ENV OSMLCM_VCA_CLOUD:      localhost
 # ENV OSMLCM_VCA_ENABLEOSUPGRADE false
 # ENV OSMLCM_VCA_APTMIRROR  http://archive.ubuntu.com/ubuntu/
 # ENV OSMLCM_VCA_PUBKEY     pubkey
 # ENV OSMLCM_VCA_CACERT     cacert
 
+# VCA - k8s
+ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm
+ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
+ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
+
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo
 ENV OSMLCM_DATABASE_URI mongodb://mongo:27017
@@ -84,32 +97,37 @@ ENV OSMLCM_DATABASE_URI mongodb://mongo:27017
 # ENV OSMLCM_DATABASE_USER  xxx
 # ENV OSMLCM_DATABASE_PASSWORD  xxx
 
-#storage
+# storage
 ENV OSMLCM_STORAGE_DRIVER                       local
 ENV OSMLCM_STORAGE_PATH                         /app/storage
-#ENV OSMLCM_STORAGE_DRIVER                       mongo
-#ENV OSMNBI_STORAGE_URI                          mongodb://mongo:27017
-#ENV OSMLCM_STORAGE_COLLECTION                   files
+# ENV OSMLCM_STORAGE_DRIVER                       mongo
+# ENV OSMLCM_STORAGE_URI                          mongodb://mongo:27017
+# ENV OSMLCM_STORAGE_COLLECTION                   files
 
 # message
 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
-ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
+# tsdb
+# ENV OSMLCM_TSDB_DRIVER     prometheus
+# ENV OSMLCM_TSDB_PATH       /etc/prometheus
+# ENV OSMLCM_TSDB_URI        http://prometheus:9090/
 
 # logs
 # ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
 ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
 
+# timeouts
+# ENV OSMLCM_TIMEOUT_NS_DEPLOY 7200
+# ENV OSMLCM_TIMEOUT_NSI_DEPLOY 7200
+
 # Copy the current directory contents into the container at /app/LCM
 ADD . /app/LCM
 
 # 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
+# HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
+#   CMD python3 -m osm_lcm.lcm_hc  || exit 1
+