X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FDockerfile;h=4185d4ac7c1a59f9e34c48e7df7464f4764cecb9;hb=5637d13c14f0ac99bc062e48035fb88ce2618ff0;hp=ebebf899ee07215dd9945a2046a51157e44df3d0;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
old mode 100644
new mode 100755
index ebebf89..4185d4a
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -15,34 +15,46 @@
 #   limitations under the License.
 #
 ##############################################################################
+#
+#   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+#   platform project (RICP).
+#
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:1-u16.04-nng1.1.1 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 . . 
-ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin
-#RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr && cd rmr/; mkdir build; cd build; /opt/bin/cmake -DDEV_PKG=1 ..; make install
-# Install RMr library and dev files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.36_amd64.deb/download.deb
-RUN dpkg -i rmr_1.0.36_amd64.deb
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr-dev_1.0.36_amd64.deb/download.deb
-RUN dpkg -i rmr-dev_1.0.36_amd64.deb
+COPY . .
 
+# Install dependencies, compile and test the module
+RUN apt-get update && apt-get install -y sudo
 
-RUN cd asn1codec && make  
-RUN go build main/http_server.go 
+# 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:20.04
+
+RUN apt-get update && apt-get install -y \
+  net-tools \
+  iputils-ping \
+  curl \
+  tcpdump
 
-FROM ubuntu:16.04
 COPY --from=ubuntu /opt/E2Manager/router.txt /opt/E2Manager/router.txt
-COPY --from=ubuntu /opt/E2Manager/http_server /opt/E2Manager/http_server
-COPY --from=ubuntu /opt/E2Manager/resources /opt/E2Manager/resources
-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 /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.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", "./http_server  -port=$port"]
+CMD ["sh", "-c", "./main  -port=$port"]