From: Adam Israel <adam.israel@canonical.com>
Date: Tue, 19 Nov 2019 12:05:22 +0000 (+0100)
Subject: Update Dockerfiles to install juju module
X-Git-Tag: v7.0.0rc1~31
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ca079d7049c9636883c737fd7e115b2d244e8ace;p=osm%2Fdevops.git

Update Dockerfiles to install juju module

Update the LCM and MON dockerfiles to install the upstream juju library
from pip.

Change-Id: I9dc31a852cd29c13cf04e39dfb116f9950f475fd
Signed-off-by: Adam Israel <adam.israel@canonical.com>
---

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 5e81a482..e9bbf1a2 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -40,21 +40,18 @@ APT::AutoRemove::SuggestsImportant "false";\n'\
 RUN apt-get update && apt-get -y install curl software-properties-common
 
 RUN apt-get update && apt-get install -y git make python3 \
-    python3-pip python3-pymongo python3-yaml python3-aiohttp \
+    python3-pip python3-pymongo python3-aiohttp \
     python3-all python3-setuptools openssh-client libffi-dev libssl-dev \
     python3-bitarray python3-regex python3-lxml dh-python wget tox \
     python3-cffi \
     && pip3 install -U pip \
-    && python3 -m pip install -U aiokafka pyang lxml six enum34 \
-    && python3 -m pip install websockets==4.0.1 \
+    && python3 -m pip install -U aiokafka lxml six enum34 \
     && python3 -m pip install requests \
     && rm -rf /var/lib/apt/lists/*
 
 # packages needed for N2VC because deb dependencies are not fine
-RUN python3 -m pip install  'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
-      'pyyaml>=3.0,<4.0' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
-      'paramiko'   # PyNaCl
-# 
+RUN python3 -m pip install -U juju
+
 # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
 #     && cd N2VC \
 #     && cd modules/libjuju && python3 setup.py develop && cd ../.. \
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 26a74e6d..96e1633f 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -40,9 +40,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && pip3 install pip==9.0.3
 
-RUN pip3 install  'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \
-      'pyyaml>=5.1.2' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \
-      'paramiko'   # PyNaCl
+RUN pip3 install juju
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseFOUR-daily