From bfb7790d10dfc34c17976c8e60372543af33a618 Mon Sep 17 00:00:00 2001 From: calvinosanch Date: Wed, 31 Jul 2019 13:31:16 +0000 Subject: [PATCH] RO, NBI, LCM and osmclient: Update pip to latest version Change-Id: I1deef6abb75fcd02eb0535498f7c398be5086ac3 Signed-off-by: calvinosanch --- docker/LCM/Dockerfile | 30 ++++++++++++++++++++++++------ docker/NBI/Dockerfile | 22 ++++++++++++++++++++-- docker/RO/Dockerfile | 20 +++++++++++++++++++- docker/osmclient/Dockerfile | 20 +++++++++++++++++++- installers/full_install_osm.sh | 4 ++-- 5 files changed, 84 insertions(+), 12 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 909ea3a2..72d6a863 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -1,3 +1,21 @@ +## +# Copyright 2019 ETSI +# +# 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 @@ -26,21 +44,21 @@ RUN apt-get update && apt-get install -y git make python3 \ python3-all python3-setuptools openssh-client libffi-dev libssl-dev \ python3-bitarray python3-regex python3-lxml dh-python wget tox \ python3-cffi \ - && pip3 install pip==9.0.3 \ - && pip3 install -U aiokafka pyang lxml six enum34 \ - && pip3 install websockets==4.0.1 \ - && pip3 install requests \ + && 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 requests \ && rm -rf /var/lib/apt/lists/* # packages needed for N2VC because deb dependencies are not fine -RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \ +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 git clone https://osm.etsi.org/gerrit/osm/N2VC.git \ # && cd N2VC \ # && cd modules/libjuju && python3 setup.py develop && cd ../.. \ -# && pip3 install -U -r requirements.txt +# && python3 -m pip install -U -r requirements.txt ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian ARG RELEASE=ReleaseFOUR-daily diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 0771c74f..094d0290 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -1,3 +1,21 @@ +## +# Copyright 2019 ETSI +# +# 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 osm/NBI docker from local NBI source code FROM ubuntu:16.04 @@ -6,8 +24,8 @@ RUN apt-get update && apt-get -y install curl software-properties-common RUN apt-get update && apt-get install -y git python3 python3-jsonschema \ python3-pymongo python3-yaml python3-pip python3-keystoneclient \ - && pip3 install pip==9.0.3 \ - && pip3 install aiokafka aiohttp cherrypy==18.0.0 pyangbind keystoneauth1 \ + && pip3 install -U pip \ + && python3 -m pip install aiokafka aiohttp cherrypy==18.0.0 pyangbind keystoneauth1 \ && mkdir -p /app/storage/kafka && mkdir -p /app/log ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 4240d26d..baec51e6 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -1,3 +1,21 @@ +## +# Copyright 2019 ETSI +# +# 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. +## + +######################################################################## + from ubuntu:xenial MAINTAINER Gennadiy Dubina ; Alfonso Tierno @@ -5,7 +23,7 @@ MAINTAINER Gennadiy Dubina ; Alfonso Tierno > ${HOME}/.bashrc -- 2.17.1