X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FDockerfile;h=6a95812879fd6677d8c3cf0583275bced24334d7;hb=011bb9161ca8e7ad0d0cf282b818672a88a5dfbf;hp=4f9561b41c98090144bbdd1c6b679686cec07545;hpb=372a275602ae05da22130a4601709291c7fbbaa6;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
old mode 100644
new mode 100755
index 4f9561b..6a95812
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -24,30 +24,11 @@ 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
 
-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 bash build-e2mgr-ubuntu.sh
 
+# Build deployable container
 FROM ubuntu:16.04
 
 RUN apt-get update && apt-get install -y \
@@ -58,12 +39,14 @@ RUN apt-get update && apt-get install -y \
   
 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.3 /usr/local/lib/librmr_si.so.3
+
 WORKDIR /opt/E2Manager
 ENV LD_LIBRARY_PATH=/usr/local/lib \
     port=3800 
 ENV RMR_SEED_RT=router.txt
+ENV RMR_VCTL_FILE=/tmp/rmr.verbose
 EXPOSE 3800
 CMD ["sh", "-c", "./main  -port=$port"]