X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=8dbba7e795b2945849f77dbf9a2d711aa058a03e;hb=457fde18dad36d9d58c794918ca79e6d72539bc1;hp=26c148b3bb03a5ebf2a9238edca26c94403ef07a;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 26c148b3..8dbba7e7 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -20,16 +20,15 @@ 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 && \ + gcc=4:7.4.* \ + python3=3.6.* \ + python3-dev=3.6.* \ + python3-setuptools=39.0.* \ + curl=7.58.* \ + genisoimage=9:1.1.* \ + netbase=5.* && \ python3 -m easy_install pip==21.0.1 -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - genisoimage=9:1.1.11-3ubuntu2 - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL ARG PYTHON3_OSM_RO_PLUGIN_URL @@ -82,11 +81,12 @@ RUN pip3 install \ FROM ubuntu:18.04 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 COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage +COPY --from=INSTALL /etc/protocols /etc/protocols VOLUME /var/log/osm