From: palsus Date: Wed, 4 Aug 2021 18:12:21 +0000 (+0000) Subject: Fix for Bug 1627: Build failed due to upstream dependency not found X-Git-Tag: v9.1.4~5 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F11102%2F1;p=osm%2Fdevops.git Fix for Bug 1627: Build failed due to upstream dependency not found Change-Id: I719c106e6f2fb92c6f00d2f9595715e1a30c7362 Signed-off-by: palsus --- diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 14850eaa..711bfd13 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -24,13 +24,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ - python3 -m easy_install pip==21.0.1 - -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + curl=7.58.0-2ubuntu3.14 \ apt-transport-https=1.6.12ubuntu0.2 \ gnupg2=2.2.4-1ubuntu1.4 \ - openssh-client + openssh-client && \ + python3 -m easy_install pip==21.0.1 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 d7ae32d5..f5727486 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -24,16 +24,14 @@ FROM ubuntu:20.04 as INSTALL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - curl=7.68.0-1ubuntu2.5 \ + curl=7.68.0-1ubuntu2.6 \ gcc=4:9.3.0-1ubuntu2 \ python3=3.8.2-0ubuntu2 \ python3-setuptools=45.2.0-1 \ - python3-dev=3.8.2-0ubuntu2 && \ + python3-dev=3.8.2-0ubuntu2 \ + openssh-client=1:8.2p1-4ubuntu0.2 && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - openssh-client=1:8.2p1-4ubuntu0.2 - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_MON_URL ARG PYTHON3_N2VC_URL diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index d32c7120..7b40d05f 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -24,7 +24,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ + curl=7.58.0-2ubuntu3.14 && \ python3 -m easy_install pip==21.0.1 ARG PYTHON3_OSM_COMMON_URL diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 934566d6..9ea5d3d0 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -18,7 +18,7 @@ FROM ubuntu:18.04 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ apt-transport-https=1.6.12ubuntu0.2 \ - curl=7.58.0-2ubuntu3.13 \ + curl=7.58.0-2ubuntu3.14 \ gnupg2=2.2.4-1ubuntu1.4 \ nginx=1.14.0-0ubuntu1.9 \ software-properties-common=0.96.24.32.14 \ diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile index f3c3eb19..953678d9 100644 --- a/docker/PLA/Dockerfile +++ b/docker/PLA/Dockerfile @@ -21,7 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ + curl=7.58.0-2ubuntu3.14 && \ python3 -m easy_install pip==21.0.1 ARG PYTHON3_OSM_COMMON_URL diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 92b1ffdd..990d3253 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -24,16 +24,14 @@ FROM ubuntu:20.04 as INSTALL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - curl=7.68.0-1ubuntu2.5 \ + curl=7.68.0-1ubuntu2.6 \ gcc=4:9.3.0-1ubuntu2 \ python3=3.8.2-0ubuntu2 \ python3-setuptools=45.2.0-1 \ - python3-dev=3.8.2-0ubuntu2 && \ + python3-dev=3.8.2-0ubuntu2 \ + mysql-client-core-8.0=8.0.26-0ubuntu0.20.04.2 && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - mysql-client-core-8.0=8.0.25-0ubuntu0.20.04.1 - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_POLICY_MODULE_URL diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index ec88edcb..fbb191a8 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -24,12 +24,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ + curl=7.58.0-2ubuntu3.14 \ + genisoimage=9:1.1.11-3ubuntu2 \ + netbase=5.4 && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - genisoimage=9:1.1.11-3ubuntu2 netbase=5.4 - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL ARG PYTHON3_OSM_RO_PLUGIN_URL diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index f5980ad6..7c460076 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -23,13 +23,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ + curl=7.58.0-2ubuntu3.14 \ + libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \ + libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \ - libssl-dev=1.1.1-1ubuntu2.1~18.04.9 - ARG PYTHON3_OSMCLIENT_URL ARG PYTHON3_OSM_IM_URL diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index a2c4378a..0a23a372 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -23,16 +23,14 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3=3.6.7-1~18.04 \ python3-dev=3.6.7-1~18.04 \ python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ - python3 -m easy_install pip==21.0.1 - -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + curl=7.58.0-2ubuntu3.14 \ gettext-base \ git=1:2.17.1-1ubuntu0.8 \ iputils-ping=3:20161105-1ubuntu3 \ jq=1.5+dfsg-2 \ - libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \ - libssl-dev=1.1.1-1ubuntu2.1~18.04.9 + libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \ + libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \ + python3 -m easy_install pip==21.0.1 ARG OSM_TESTS_URL ARG PYTHON3_OSM_IM_URL