X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=6143fdb45c7a661d385af508aedebffa62d2598f;hb=896c3acac45d9e23300072e0cf544bf728396066;hp=3f9ad1c288d00e75e048713ba7f9132b1187e7a1;hpb=55040221bdc38b86d1f140485d9e7d022fd9abb0;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index 3f9ad1c..6143fdb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,87 +20,101 @@
 #	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 submgrprebuild
+###########################################################
+#
+###########################################################
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as submgrcore
 
-RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb
+RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind
 
 WORKDIR /tmp
 
-ARG RMRVERSION=1.13.1
+ARG RMRVERSION=3.2.4
 # Install RMr shared library
 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_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_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
-
 # "Installing Swagger"
-RUN cd /usr/local/go/bin \
-    && wget --quiet https://github.com/go-swagger/go-swagger/releases/download/v0.19.0/swagger_linux_amd64 \
+RUN wget --quiet https://github.com/go-swagger/go-swagger/releases/download/v0.19.0/swagger_linux_amd64 \
     && mv swagger_linux_amd64 swagger \
-    && chmod +x swagger
+    && chmod +x swagger \
+    && mkdir -p /root/.go/bin \
+    && mv swagger /root/.go/bin
 
+ENV GOPATH=/root/.go
+ENV PATH=$PATH:/root/.go/bin
+RUN go get -u github.com/go-delve/delve/cmd/dlv
 
 WORKDIR /opt/submgr
 
-RUN mkdir pkg
-
-#
-#
+###########################################################
 #
+###########################################################
+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
 
 # unittest
-RUN cd e2ap && /usr/local/go/bin/go test -v ./pkg/conv
-RUN cd e2ap && /usr/local/go/bin/go test -v ./pkg/e2ap_wrapper
+RUN cd e2ap && go test -v ./pkg/conv
+RUN cd e2ap && go test -v ./pkg/e2ap_wrapper
 
 # test formating (not important)
-RUN cd e2ap && test -z "$(/usr/local/go/bin/gofmt -l pkg/conv/*.go)"
-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)"
+RUN cd e2ap && test -z "$(gofmt -l pkg/conv/*.go)"
+RUN cd e2ap && test -z "$(gofmt -l pkg/e2ap_wrapper/*.go)"
+RUN cd e2ap && test -z "$(gofmt -l pkg/e2ap/*.go)"
+RUN cd e2ap && test -z "$(gofmt -l pkg/e2ap/e2ap_tests/*.go)"
 
 
-FROM submgrprebuild as submgrbuild
+###########################################################
+#
+###########################################################
+FROM submgre2apbuild as submgrbuild
 #
 #
 #
 COPY go.mod go.mod
 COPY go.sum go.sum
 
-RUN /usr/local/go/bin/go mod download
+RUN go mod download
+RUN go mod tidy
 
 #
 #
 #
+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
+    swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
+
 
 #
 #
@@ -109,26 +123,34 @@ COPY pkg pkg
 COPY cmd cmd
 
 RUN mkdir -p /opt/bin && \
-    /usr/local/go/bin/go build -o /opt/bin/submgr cmd/submgr.go && \
+    go build -o /opt/bin/submgr cmd/submgr.go && \
     mkdir -p /opt/build/container/usr/local
 
 
-RUN /usr/local/go/bin/go mod tidy
+RUN 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 -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control
+RUN go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control 
 
-RUN /usr/local/go/bin/go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
+#-c -o submgr_test
+#RUN ./submgr_test -test.coverprofile /tmp/submgr_cover.out
+
+RUN 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 "$(gofmt -l pkg/control/*.go)"
+RUN test -z "$(gofmt -l pkg/teststub/*.go)"
+RUN test -z "$(gofmt -l pkg/teststubdummy/*.go)"
+RUN test -z "$(gofmt -l pkg/teststube2ap/*.go)"
+RUN test -z "$(gofmt -l pkg/xapptweaks/*.go)"
 
+
+###########################################################
 #
-#
-#
+###########################################################
 FROM ubuntu:18.04
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump