diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 6cb51a289ce4f9fd7e2534caa895115a22e1da10..abd437a68bfe1e40611e00e1af197a3ef4095607 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 d7ae32d5203d6bfb030b7496f9c02af4d33bf2dd..f57274869da8442290197c50ede2e3ef16824fe2 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 d32c7120e7eff11c50978e26191c848ca63ade94..7b40d05fc7c5da6183da22f42e42f0b89f9f12aa 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 934566d61e62fd0da876ce44c38300f5cd1562a4..9ea5d3d09eb535ce2a37e3ce1f810fab52a1ad3e 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 f3c3eb1937595d204476e3cd5ebff8ce6fb9b923..953678d97b4d5ef3b77dd7240c17dc656ba845fe 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 92b1ffdd73688ec1ce477fb5b378463a8765831c..990d325362263bef4d291f7b576afbde3b762fe7 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 ec88edcb3d3e80dd549bc274102dfad89f515114..fbb191a8a3c77039d088f9eabc53ecba72213c1c 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 f5980ad6ec1eb97a2d55764184bc7829fb5e5dd8..7c46007666dc3ae15bbcbd2ea89b9e872b02f5b2 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 371430a8744dcdf2451f1a50a3b32db880e0a562..3bc0ce94a5e09fdac163e9c0cd756ebf71bcb118 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