X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FDockerfile;h=89c23af625f97351fc775bbc40d18a8e768ed746;hb=565a58f44b5a99f4088b5f0c7ef3f7b0498f2ced;hp=90b44e952ea7ee4dc0efabd1a864d04942f97ec6;hpb=6df73c6bad82b1cbc3fe487bbe746b0c3b141b80;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
old mode 100644
new mode 100755
index 90b44e9..89c23af
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -15,50 +15,39 @@
 #   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:2-u16.04-nng as ubuntu
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 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/staging/packages/debian/stretch/rmr_1.10.0_amd64.deb/download.deb
-RUN dpkg -i rmr_1.10.0_amd64.deb
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.10.0_amd64.deb/download.deb
-RUN dpkg -i rmr-dev_1.10.0_amd64.deb
-
-RUN cd 3rdparty/asn1codec && make
-RUN go build app/main.go
+COPY . .
 
-# Execute UT
-ENV LD_LIBRARY_PATH=/usr/local/lib
+# Install dependencies, compile and test the module
+RUN apt-get update && apt-get install -y sudo
+RUN bash build-e2mgr-ubuntu.sh
 
-# cgocheck=2 enables expensive checks that should not miss any errors, but will cause your program to run slower.
-# clobberfree=1 causes the garbage collector to clobber the memory content of an object with bad content when it frees the object.
-# gcstoptheworld=1 disables concurrent garbage collection, making every garbage collection a stop-the-world event.
-# Setting gcstoptheworld=2 also disables concurrent sweeping after the garbage collection finishes.
-# Setting allocfreetrace=1 causes every allocation to be profiled and a stack trace printed on each object's allocation and free.
-ENV GODEBUG=cgocheck=2,clobberfree=1,gcstoptheworld=2,allocfreetrace=0
-ENV RIC_ID="bbbccc-abcd0e/20"
-RUN go test ./...
-
-FROM ubuntu:16.04
+# Build deployable container
+FROM ubuntu:18.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 /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/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", "./main  -port=$port"]