From: Pedro Escaleira Date: Sun, 3 Apr 2022 17:31:50 +0000 (+0100) Subject: Bug 1970 fixed X-Git-Tag: v12.0.0rc1~5 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F11829%2F2;p=osm%2FNBI.git Bug 1970 fixed Now the Dockerfile.local uses Ubuntu 20.04; The paths in the format `/[...]/python/[...]` where replaced with the new Python version (3.8 instead of 3.6) Change-Id: Iccccecb2bd4f4d8156357dba582b0460987b060f Signed-off-by: Pedro Escaleira --- diff --git a/Dockerfile.local b/Dockerfile.local index 2816d0a..04f2d2e 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -16,7 +16,7 @@ ######################################################################## -FROM ubuntu:18.04 as INSTALL +FROM ubuntu:20.04 as INSTALL WORKDIR /build @@ -46,13 +46,13 @@ RUN python3 -m build /build && \ python3 -m pip install /build/dist/*.whl -FROM ubuntu:18.04 as FINAL +FROM ubuntu:20.04 as FINAL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal 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 RUN mkdir -p /app/storage/kafka && mkdir -p /app/log @@ -60,9 +60,9 @@ WORKDIR /app/osm_nbi EXPOSE 9999 -RUN cp -R /usr/local/lib/python3.6/dist-packages/osm_nbi/html_public /app/osm_nbi/html_public -RUN cp /usr/local/lib/python3.6/dist-packages/osm_nbi/nbi.cfg /app/osm_nbi/ -RUN cp -R /usr/local/lib/python3.6/dist-packages/osm_nbi/http /app/osm_nbi/ +RUN cp -R /usr/local/lib/python3.8/dist-packages/osm_nbi/html_public /app/osm_nbi/html_public +RUN cp /usr/local/lib/python3.8/dist-packages/osm_nbi/nbi.cfg /app/osm_nbi/ +RUN cp -R /usr/local/lib/python3.8/dist-packages/osm_nbi/http /app/osm_nbi/ # Used for local storage VOLUME /app/storage