X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=299990ad519a6a1cc77c49d1183732bbc1d92627;hb=72ac65cee3fd3307338c96036f5c0ed06daa3617;hp=f5980ad6ec1eb97a2d55764184bc7829fb5e5dd8;hpb=588db9f1ef611df171cd8f5b6bc73f790853e417;p=osm%2Fdevops.git diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index f5980ad6..299990ad 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -19,16 +19,14 @@ FROM ubuntu:18.04 as INSTALL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.0-1ubuntu2.3 \ - 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 \ - libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \ - libssl-dev=1.1.1-1ubuntu2.1~18.04.9 + 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 ARG PYTHON3_OSMCLIENT_URL ARG PYTHON3_OSM_IM_URL @@ -46,7 +44,7 @@ RUN pip3 install \ FROM ubuntu:18.04 as FINAL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04 + DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* 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