From c9cba067f935123df251d8357596c1918cc47651 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 17 Apr 2018 18:06:23 +0200 Subject: [PATCH] Updated Dockerfiles and postinst for RO and LCM to use pip-9.0.3 Also replaces apt by apt-get in Dockerfiles Change-Id: I54c8c45745e0550878d05f3c386ea7d633b50786 Signed-off-by: garciadeblas --- Dockerfile | 2 +- docker/Dockerfile-fromdeb | 6 +++--- docker/Dockerfile-local | 2 +- lcm/Dockerfile | 1 + scripts/python-osm-ro.postinst | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01dc9ea2..0fb074ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:16.04 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ - DEBIAN_FRONTEND=noninteractive pip install -U pip && \ + DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \ DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \ DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ diff --git a/docker/Dockerfile-fromdeb b/docker/Dockerfile-fromdeb index 08e3f231..de01e39b 100644 --- a/docker/Dockerfile-fromdeb +++ b/docker/Dockerfile-fromdeb @@ -17,11 +17,11 @@ APT::AutoRemove::SuggestsImportant "false";\n'\ > /etc/apt/apt.conf.d/99_norecommends -RUN apt update && apt install -y curl mysql-client software-properties-common \ +RUN apt-get update && apt-get install -y curl mysql-client software-properties-common \ && add-apt-repository -y "deb http://osm-download.etsi.org/repository/osm/debian/ReleaseTHREE stable SO UI RO IM osmclient openvim" \ && curl "http://osm-download.etsi.org/repository/osm/debian/ReleaseTHREE/OSM%20ETSI%20Release%20Key.gpg" | apt-key add - \ - && apt update \ - && apt install -y python-osm-ro \ + && apt-get update \ + && apt-get install -y python-osm-ro \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /bin/RO diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index caf104b2..67a3ca94 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -12,7 +12,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \ DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ - DEBIAN_FRONTEND=noninteractive pip install -U pip && \ + DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \ DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \ DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ diff --git a/lcm/Dockerfile b/lcm/Dockerfile index 698ec9ca..06a0fcdc 100644 --- a/lcm/Dockerfile +++ b/lcm/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y git python3 \ python3-stdeb python3-setuptools python3-all python-all \ python3-bitarray python3-regex python3-lxml debhelper dh-python tox wget \ python3-cffi \ + && pip3 install pip==9.0.3 \ && pip3 install -U aiokafka pyang lxml six enum34 RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \ diff --git a/scripts/python-osm-ro.postinst b/scripts/python-osm-ro.postinst index 615cbc4a..20dbc5eb 100755 --- a/scripts/python-osm-ro.postinst +++ b/scripts/python-osm-ro.postinst @@ -22,7 +22,7 @@ OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` #OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` #Pip packages required for vmware connector -pip install --upgrade pip +pip install pip==9.0.3 pip install --upgrade pyvcloud==19.1.1 pip install --upgrade progressbar pip install --upgrade prettytable -- 2.25.1