Merge "RIC:1060: Change in PTL"

[ric-plt/e2mgr.git] / E2Manager / Dockerfile

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
old mode 100755 (executable)
new mode 100644 (file)
index 4d4bb0b..d8810d4
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -20,17 +20,24 @@
 #   platform project (RICP).
 #
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.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 . .
 
 # 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:18.04
+FROM ubuntu:20.04
 
 RUN apt-get update && apt-get install -y \
   net-tools \
@@ -42,7 +49,7 @@ 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_si.so.3 /usr/local/lib/librmr_si.so.3
+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 \
@@ -50,4 +57,5 @@ ENV LD_LIBRARY_PATH=/usr/local/lib \
 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"]
+