Merge branch feature7928. It includes feature5837

[osm/LCM.git] / Dockerfile.local

diff --git a/Dockerfile.local b/Dockerfile.local
index 772af7a..a905732 100644 (file)
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -31,20 +31,18 @@ RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15
 
 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 \
-    && git -C /app/N2VC fetch "https://osm.etsi.org/gerrit/osm/N2VC" refs/changes/56/8156/1 \
-    && git -C /app/N2VC checkout FETCH_HEAD \
-    && 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