From d7449362766262e09ec63ada999e03ded530f907 Mon Sep 17 00:00:00 2001 From: beierlm Date: Thu, 13 Jan 2022 10:53:08 -0500 Subject: [PATCH] Bug 1841: LTS Support Updates base to Ubuntu 20.04 Updates python to 3.8 Updates pip dependencies to more recent versions Adds apt cache to stage 2 dockerfile Fixes bug 1841 Change-Id: I70af3cfab7484d7b284c143d554bef9f0be51812 Signed-off-by: beierlm --- Dockerfile | 6 ++++++ docker/LCM/Dockerfile | 37 ++++++++++++++++++++----------- docker/MON/Dockerfile | 21 ++++++++++++++---- docker/NBI/Dockerfile | 28 +++++++++++++++--------- docker/NG-UI/Dockerfile | 32 ++++++++++++++++----------- docker/PLA/Dockerfile | 43 +++++++++++++++++++++++++++---------- docker/POL/Dockerfile | 20 ++++++++++++----- docker/RO/Dockerfile | 33 ++++++++++++++++++---------- docker/osmclient/Dockerfile | 41 ++++++++++++++++++++++++----------- docker/tests/Dockerfile | 24 +++++++++++---------- 10 files changed, 196 insertions(+), 89 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3f74004..931da3ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,12 @@ FROM ubuntu:18.04 +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi + RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install \ debhelper \ diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 15cf65ab..ef178e12 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,15 +25,17 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* \ - apt-transport-https=1.6.* \ + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + apt-transport-https=2.0.* \ gnupg2=2.2.* \ - openssh-client=1:7.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + openssh-client=1:8.* # https://kubernetes.io/releases/ RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \ @@ -70,16 +72,27 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt \ -r /usr/lib/python3/dist-packages/n2vc/requirements.txt -FROM ubuntu:18.04 +####################################################################################### +FROM ubuntu:20.04 as FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ + && rm -rf /var/lib/apt/lists/* RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - python3-minimal=3.6.* \ ca-certificates \ && rm -rf /var/lib/apt/lists/* COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index adb736ac..281e039e 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -25,13 +25,15 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - curl=7.68.* \ gcc=4:9.3.* \ python3=3.8.* \ - python3-setuptools=45.2.* \ python3-dev=3.8.* \ - openssh-client=1:8.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + openssh-client=1:8.* ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_MON_URL @@ -51,11 +53,22 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \ -r /usr/lib/python3/dist-packages/osm_mon/requirements.txt +####################################################################################### FROM ubuntu:20.04 as FINAL +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi + RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ python3-minimal=3.8.* \ + && rm -rf /var/lib/apt/lists/* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ ca-certificates \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile index 3c4a7f19..e43a0377 100644 --- a/docker/NBI/Dockerfile +++ b/docker/NBI/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,12 +25,12 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_IM_URL @@ -50,14 +50,22 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_im/requirements.txt \ -r /usr/lib/python3/dist-packages/osm_nbi/requirements.txt -FROM ubuntu:18.04 as FINAL +####################################################################################### +FROM ubuntu:20.04 as FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ && rm -rf /var/lib/apt/lists/* COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages # Creating the user for the app RUN groupadd -g 1000 appuser && \ diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 8350034c..c4d67df9 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 AS BUILD +FROM ubuntu:20.04 as INSTALL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,18 +25,17 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - apt-transport-https=1.6.* \ - curl=7.58.* \ + apt-transport-https=2.0.* \ + curl=7.68.* \ gnupg2=2.2.* \ - nginx=1.14.* \ - software-properties-common=0.96.* \ + nginx=1.18.* \ + software-properties-common=0.99.* \ xz-utils=5.2.* RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list && \ - apt-get update && \ - apt-get install -y nodejs=10.24.* \ - && rm -rf /var/lib/apt/lists/* + echo "deb https://deb.nodesource.com/node_10.x focal main" | tee -a /etc/apt/sources.list.d/nodesource.list && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs=10.24.* ARG OSM_NGUI_URL @@ -49,21 +48,28 @@ RUN npm install # Building app. RUN npm run build -FROM ubuntu:18.04 AS FINAL +####################################################################################### +FROM ubuntu:20.04 AS FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - nginx=1.14.* && \ + nginx=1.18.* && \ rm -rf /var/lib/apt/lists/* # Removing the Nginx default page. RUN rm -rf /usr/share/nginx/html/* # Copying Nginx configuration -COPY --from=BUILD /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default +COPY --from=INSTALL /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default # Copying angular build to Nginx default page. -COPY --from=BUILD /usr/share/osm-ngui/dist/osm /usr/share/nginx/html +COPY --from=INSTALL /usr/share/osm-ngui/dist/osm /usr/share/nginx/html EXPOSE 80 diff --git a/docker/PLA/Dockerfile b/docker/PLA/Dockerfile index dde6a373..282a8329 100644 --- a/docker/PLA/Dockerfile +++ b/docker/PLA/Dockerfile @@ -15,7 +15,19 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,12 +37,12 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_PLA_URL @@ -50,15 +62,24 @@ ADD https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.2/MiniZincIDE- RUN tar -zxf /minizinc.tgz && \ mv /MiniZincIDE-2.4.2-bundle-linux /minizinc -FROM ubuntu:18.04 -LABEL authors="Lars-Göran Magnusson" +####################################################################################### +FROM ubuntu:20.04 as FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ && rm -rf /var/lib/apt/lists/* +LABEL authors="Lars-Göran Magnusson" + COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages COPY --from=INSTALL /usr/bin/osm* /usr/bin/ COPY --from=INSTALL /minizinc /minizinc diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 0046183e..72d73fd2 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -25,13 +25,15 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - curl=7.68.* \ gcc=4:9.3.* \ python3=3.8.* \ - python3-setuptools=45.2.* \ python3-dev=3.8.* \ - mysql-client-core-8.0=8.0.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + mysql-client-core-8.0=8.0.* ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_POLICY_MODULE_URL @@ -46,10 +48,18 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \ -r /usr/lib/python3/dist-packages/osm_policy_module/requirements.txt +####################################################################################### FROM ubuntu:20.04 as FINAL +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi + RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.* \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ && rm -rf /var/lib/apt/lists/* COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index b2f32a4c..0a98deea 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,14 +25,17 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* \ + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ genisoimage=9:1.1.* \ - netbase=5.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + netbase=6.* ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL @@ -81,14 +84,22 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \ -r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt -FROM ubuntu:18.04 +####################################################################################### +FROM ubuntu:20.04 as FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ && rm -rf /var/lib/apt/lists/* COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage COPY --from=INSTALL /etc/protocols /etc/protocols diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index 49b01f37..c7c48169 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -15,7 +15,13 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,14 +31,16 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* \ - libcurl4-openssl-dev=7.58.* \ - libssl-dev=1.1.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + libcurl4-openssl-dev=7.68.* \ + libssl-dev=1.1.* ARG PYTHON3_OSMCLIENT_URL ARG PYTHON3_OSM_IM_URL @@ -47,13 +55,22 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \ -r /usr/lib/python3/dist-packages/osm_im/requirements.txt -FROM ubuntu:18.04 as FINAL +####################################################################################### +FROM ubuntu:20.04 as FINAL + +ARG APT_PROXY +RUN if [ ! -z $APT_PROXY ] ; then \ + echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\ + echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\ + fi RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + python3-minimal=3.8.* \ + && rm -rf /var/lib/apt/lists/* COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages -COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages /usr/local/lib/python3.8/dist-packages ENV OSM_SOL005=True ENV OSM_HOSTNAME=nbi:9999 diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 4f7ef7c0..ed631cf3 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. ####################################################################################### -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as FINAL ARG APT_PROXY RUN if [ ! -z $APT_PROXY ] ; then \ @@ -25,18 +25,20 @@ RUN if [ ! -z $APT_PROXY ] ; then \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.* \ - python3=3.6.* \ - python3-dev=3.6.* \ - python3-setuptools=39.0.* \ - curl=7.58.* \ + gcc=4:9.3.* \ + python3=3.8.* \ + python3-dev=3.8.* \ + python3-pip=20.0.2* \ + python3-setuptools=45.2.* \ + curl=7.68.* + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ gettext-base=0.19.* \ - git=1:2.17.* \ + git=1:2.25.* \ iputils-ping=3:* \ - jq=1.5* \ - libcurl4-openssl-dev=7.58.* \ - libssl-dev=1.1.* && \ - python3 -m easy_install pip==21.0.1 setuptools==51.0.0 + jq=1.6* \ + libcurl4-openssl-dev=7.68.* \ + libssl-dev=1.1.* ARG OSM_TESTS_URL ARG PYTHON3_OSM_IM_URL -- 2.25.1