Fix pip version dependency

There are numerous package differences between the Docker image built by
Jenkins and the Dockerfile.local in the LCM repository. One of these
version mismatches is causing native charms in 6.0.4rc1 to fail.

In particular, the version of cffi needs to be upgraded in order for the
paramiko library to successfully ssh to the VM being used to run the
native charm.

This patch installs the current stable version, 1.13.2, of cffi, rather
than the previously installed version of 1.5.2

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

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 909ea3a..145a251 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -1,3 +1,15 @@
+# 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.
+
 # This creates som/LCM docker from from last stable package
 
 FROM ubuntu:16.04
@@ -30,6 +42,7 @@ RUN apt-get update && apt-get install -y git make python3 \
     && pip3 install -U aiokafka pyang lxml six enum34 \
     && pip3 install websockets==4.0.1 \
     && pip3 install requests \
+    && pip3 install cffi==1.5.2 \
     && rm -rf /var/lib/apt/lists/*
 
 # packages needed for N2VC because deb dependencies are not fine