X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FDockerfile;h=1352405847e46564c71bf2eb239b0efab4739d79;hb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;hp=25a972a6a4e8e41bf35d578ac749ec3e7a893346;hpb=63249264955a37429a64ebfec7028c6a487bdf1e;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
old mode 100644
new mode 100755
index 25a972a..1352405
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -23,31 +23,13 @@
 FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng 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.13.0_amd64.deb/download.deb
-RUN dpkg -i rmr_1.13.0_amd64.deb
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.13.0_amd64.deb/download.deb
-RUN dpkg -i rmr-dev_1.13.0_amd64.deb
+COPY . .
 
-RUN cd 3rdparty/asn1codec && make
-RUN go build app/main.go
-
-# Execute UT
-ENV LD_LIBRARY_PATH=/usr/local/lib
-
-# 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"
-ENV RMR_SEED_RT=/opt/E2Manager/router_test.txt
-RUN go-acc $(go list ./... | grep -v e2mgr/mocks | grep -v e2mgr/tests |grep -v e2mgr/e2managererrors| grep -v e2mgr/enums)
+# Install dependencies, compile and test the module
+RUN apt-get update && apt-get install -y sudo
+RUN bash build-e2mgr-ubuntu.sh
 
+# Build deployable container
 FROM ubuntu:16.04
 
 RUN apt-get update && apt-get install -y \
@@ -55,16 +37,16 @@ RUN apt-get update && apt-get install -y \
   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.3 /usr/local/lib/librmr_si.so.3
+
 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