X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=89811c81f2a86c9a0b66ed6896fd7aacaf99b905;hb=e530286062bdc07625e54433bd64530ae7ae2118;hp=b3ad8909e20f6325645674733a6012baf9184515;hpb=586cbbc7da7e66d7143ec685012380d63f00cacd;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index b3ad890..89811c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,20 +20,21 @@
 #	Abstract:	Builds a container to compile Subscription Manager's code
 #	Date:		28 May 2019
 #
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:3-u18.04-nng as submgrbuild
 
-RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb
+###########################################################
+#
+###########################################################
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:3-u18.04-nng as submgrcore
+
+RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind
 
 WORKDIR /tmp
 
+ARG RMRVERSION=1.13.1
 # Install RMr shared library
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.10.0_amd64.deb/download.deb && dpkg -i rmr_1.10.0_amd64.deb && rm -rf rmr_1.10.0_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.10.0_amd64.deb/download.deb && dpkg -i rmr-dev_1.10.0_amd64.deb && rm -rf rmr-dev_1.10.0_amd64.deb
-
-# "PULLING LOG and COMPILING LOG"
-#RUN git clone "https://gerrit.o-ran-sc.org/r/com/log" /opt/log && cd /opt/log && \
-# ./autogen.sh && ./configure && make install && ldconfig
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 # "Installing Swagger"
 RUN cd /usr/local/go/bin \
@@ -42,28 +43,33 @@ RUN cd /usr/local/go/bin \
     && chmod +x swagger
 
 
-WORKDIR /opt/submgr
+ENV GOPATH=/root/.go
+ENV PATH=$PATH:/root/.go/bin
+RUN /usr/local/go/bin/go get -u github.com/go-delve/delve/cmd/dlv
 
-RUN mkdir pkg
+WORKDIR /opt/submgr
 
+###########################################################
 #
-#
-#
+###########################################################
+FROM submgrcore as submgre2apbuild
+
+
 ENV CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 ENV CGO_CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 
 COPY 3rdparty 3rdparty
 RUN cd 3rdparty/libe2ap && \
-    gcc -c ${CFLAGS} -I. -fPIC *.c  && \
-    gcc *.o -shared -o libe2ap.so && \
+    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
+    gcc *.o -g -shared -o libe2ap.so && \
     cp libe2ap.so /usr/local/lib/ && \
     cp *.h /usr/local/include/ && \
     ldconfig
 
 COPY e2ap e2ap
 RUN cd e2ap/libe2ap_wrapper && \
-    gcc -c ${CFLAGS} -fPIC *.c  && \
-    gcc *.o -shared -o libe2ap_wrapper.so && \
+    gcc -c ${CFLAGS} -g -fPIC *.c  && \
+    gcc *.o -g -shared -o libe2ap_wrapper.so && \
     cp libe2ap_wrapper.so /usr/local/lib/ && \
     cp *.h /usr/local/include/ && \
     ldconfig
@@ -78,6 +84,11 @@ RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap_wrapper/*.go)"
 RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap/*.go)"
 RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/e2ap/e2ap_tests/*.go)"
 
+
+###########################################################
+#
+###########################################################
+FROM submgre2apbuild as submgrbuild
 #
 #
 #
@@ -89,13 +100,18 @@ RUN /usr/local/go/bin/go mod download
 #
 #
 #
+RUN mkdir pkg
 COPY api api
 
-# "Getting and generating routing managers api client"
+
+ARG RTMGRVERSION=cd7867c8f527f46fd8702b0b8d6b380a8e134bea
+
 RUN git clone "https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" \
+    && git -C "rtmgr" checkout $RTMGRVERSION \
     && cp rtmgr/api/routing_manager.yaml api/ \
     && rm -rf rtmgr
 
+
 RUN mkdir -p /root/go && \
     /usr/local/go/bin/swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
 
@@ -115,14 +131,25 @@ RUN /usr/local/go/bin/go mod tidy
 # unittest
 COPY test/config-file.json test/config-file.json
 ENV CFG_FILE=/opt/submgr/test/config-file.json
-RUN /usr/local/go/bin/go test -count=1 -v ./pkg/control
+
+RUN /usr/local/go/bin/go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control 
+
+#-c -o submgr_test
+#RUN ./submgr_test -test.coverprofile /tmp/submgr_cover.out
+
+RUN /usr/local/go/bin/go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
 
 # test formating (not important)
 RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/control/*.go)"
+RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/teststub/*.go)"
+RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/teststubdummy/*.go)"
+RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/teststube2ap/*.go)"
+RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/xapptweaks/*.go)"
 
+
+###########################################################
 #
-#
-#
+###########################################################
 FROM ubuntu:18.04
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump