Commit aa4f7127 authored by escaleira's avatar escaleira Committed by garciadeblas
Browse files

Bug 1970 fixed



Now the Dockerfile.local uses Ubuntu 20.04;
The paths in the format `/[...]/python<version>/[...]` where replaced
with the new Python version (3.8 instead of 3.6)

Change-Id: Iccccecb2bd4f4d8156357dba582b0460987b060f
Signed-off-by: escaleira's avatarPedro Escaleira <escaleira@av.it.pt>
parent c33a1ebf
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -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