X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FDockerfile;h=d8810d49145f6b7a46e20bb8df26786f737c2af3;hb=2f26f3da6b2a1cb20024ff191f88baedf63db0d4;hp=99dfc3520b62110f62810a218f878205ed0a8b0b;hpb=b23d04b0a9b31a525ecb3a55dacb6c22008339e1;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile old mode 100755 new mode 100644 index 99dfc35..d8810d4 --- a/E2Manager/Dockerfile +++ b/E2Manager/Dockerfile @@ -20,33 +20,42 @@ # platform project (RICP). # -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu +FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.0.0 as ubuntu WORKDIR /opt/E2Manager -COPY . . +COPY . . # Install dependencies, compile and test the module +RUN apt-get update && apt-get install -y sudo + +# Update CA certificates +RUN apt update && apt install --reinstall -y \ + ca-certificates \ + && \ + update-ca-certificates + RUN bash build-e2mgr-ubuntu.sh # Build deployable container -FROM ubuntu:16.04 +FROM ubuntu:20.04 RUN apt-get update && apt-get install -y \ net-tools \ iputils-ping \ curl \ tcpdump - + COPY --from=ubuntu /opt/E2Manager/router.txt /opt/E2Manager/router.txt COPY --from=ubuntu /opt/E2Manager/main /opt/E2Manager/main COPY --from=ubuntu /opt/E2Manager/resources/configuration.yaml /opt/E2Manager/resources/configuration.yaml COPY --from=ubuntu /opt/E2Manager/resources/rmr.verbose /tmp/rmr.verbose -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.1 /usr/local/lib/librmr_nng.so.1 -COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.4 /usr/local/lib/librmr_si.so.4 + WORKDIR /opt/E2Manager ENV LD_LIBRARY_PATH=/usr/local/lib \ - port=3800 + port=3800 ENV RMR_SEED_RT=router.txt ENV RMR_VCTL_FILE=/tmp/rmr.verbose EXPOSE 3800 -CMD ["sh", "-c", "./main -port=$port"] +CMD ["sh", "-c", "./main -port=$port -f /etc/config/log-level.yaml"] +