From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 21 Nov 2019 12:25:34 +0000 (+0000)
Subject: changes to use upstream N2VC libjuju
X-Git-Tag: v7.0.0rc1~19
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F8200%2F2;p=osm%2FLCM.git

changes to use upstream N2VC libjuju

Change-Id: I2be62ea0f3a613a7af2fa0b27057a58c98f9a531
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/Dockerfile.local b/Dockerfile.local
index e488291..4e0ee05 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -20,18 +20,18 @@ WORKDIR /app/LCM
 
 RUN apt-get update && apt-get install -y git tox python3 \
     python3-pip python3-aiohttp python3-jinja2 \
-    && pip3 install pip==9.0.3 \
-    && pip3 install -U 'PyYAML==3.*' 'aiohttp==0.20.2' flake8
+    && 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