From 496e32833ceab94b5bf05a32ed593b80ed7b91d9 Mon Sep 17 00:00:00 2001 From: sousaedu Date: Tue, 31 Aug 2021 18:52:26 +0100 Subject: [PATCH] Upgrading setuptools to 51.0.0 Some newer packages, in requirements.txt, use the Metadata version format available in 51.0.0. Docs: https://setuptools.readthedocs.io/en/latest/userguide/declarative_config.html#metadata Change-Id: I2a7c22c2fa42e7111aed462b81f5be9040d0d7f9 Signed-off-by: sousaedu --- docker/LCM/Dockerfile | 2 +- docker/MON/Dockerfile | 2 +- docker/NBI/Dockerfile | 2 +- docker/PLA/Dockerfile | 2 +- docker/POL/Dockerfile | 2 +- docker/RO/Dockerfile | 2 +- docker/osmclient/Dockerfile | 2 +- docker/tests/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index c2d05e19..c74b188f 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -28,7 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ apt-transport-https=1.6.* \ gnupg2=2.2.* \ openssh-client=1:7.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \ && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \ diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index 765324c8..f619e970 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -30,7 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-setuptools=45.2.* \ python3-dev=3.8.* \ openssh-client=1:8.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_MON_URL diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 0f0866a7..3b502567 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -25,7 +25,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-dev=3.6.* \ python3-setuptools=39.0.* \ curl=7.58.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_IM_URL diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile index ffc3588b..712a095a 100644 --- a/docker/PLA/Dockerfile +++ b/docker/PLA/Dockerfile @@ -22,7 +22,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-dev=3.6.* \ python3-setuptools=39.0.* \ curl=7.58.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_PLA_URL diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index d87e8454..f78283a5 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -30,7 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-setuptools=45.2.* \ python3-dev=3.8.* \ mysql-client-core-8.0=8.0.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_POLICY_MODULE_URL diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 8dbba7e7..ba7d54d1 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -27,7 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ curl=7.58.* \ genisoimage=9:1.1.* \ netbase=5.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index e07116ff..299990ad 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ curl=7.58.* \ libcurl4-openssl-dev=7.58.* \ libssl-dev=1.1.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSMCLIENT_URL ARG PYTHON3_OSM_IM_URL diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index d855f50c..4c5d9a6c 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -30,7 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ jq=1.5* \ libcurl4-openssl-dev=7.58.* \ libssl-dev=1.1.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG OSM_TESTS_URL ARG PYTHON3_OSM_IM_URL -- 2.25.1