X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=ed2e7518cef0925cab98436d18152a770c9fa7bb;hb=0bb76b8349891790788a622c69591bac5f5930d1;hp=94b826b42a718ea86d25a2e0b474f1337b5223bf;hpb=7eb69048a3e3ddcf7fb8d3bf9567a66e806b3cd7;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index 94b826b..ed2e751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@
 ###########################################################
 #
 ###########################################################
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:6-u18.04-nng as submgrcore
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as submgrcore
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind
 
@@ -39,7 +39,7 @@ WORKDIR /tmp
 #
 # Swagger
 #
-ARG SWAGGERVERSION=v0.19.0
+ARG SWAGGERVERSION=v0.23.0
 ARG SWAGGERURL=https://github.com/go-swagger/go-swagger/releases/download/${SWAGGERVERSION}/swagger_linux_amd64
 RUN wget --quiet ${SWAGGERURL} \
     && mv swagger_linux_amd64 swagger \
@@ -57,9 +57,9 @@ RUN export GOBIN=/usr/local/bin/ ; \
 #
 # RMR
 #
-ARG RMRVERSION=3.6.5
-ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb
-ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb
+ARG RMRVERSION=4.7.4
+ARG RMRLIBURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb
+ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb
 RUN wget --content-disposition ${RMRLIBURL} && dpkg -i rmr_${RMRVERSION}_amd64.deb
 RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
 RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb
@@ -90,23 +90,9 @@ RUN cd 3rdparty/E2AP-v01.00.00 && \
     cp *.h /usr/local/include/ && \
     ldconfig
 
-RUN cd 3rdparty/E2SM-gNB-NRT_V4.0.1 && \
-    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
-    gcc *.o -g -shared -o libgnbnrt.so && \
-    cp libgnbnrt.so /usr/local/lib/ && \
-    cp *.h /usr/local/include/ && \
-    ldconfig
-
-RUN cd 3rdparty/E2SM-gNB-X2-V4.0.1 && \
-    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
-    gcc *.o -g -shared -o libgnbx2.so && \
-    cp libgnbx2.so /usr/local/lib/ && \
-    cp *.h /usr/local/include/ && \
-    ldconfig
 
 RUN echo "E2AP         E2AP-v01.00.00" >> /manifests/versions.txt
-RUN echo "E2SM-gNB-NRT E2SM-gNB-NRT_V4.0.1" >> /manifests/versions.txt
-RUN echo "E2SM-gNB-X2  E2SM-gNB-X2-V4.0.1" >> /manifests/versions.txt
+
 
 COPY e2ap e2ap
 RUN cd e2ap/libe2ap_wrapper && \
@@ -135,10 +121,7 @@ FROM submgre2apbuild as submgrbuild
 #
 #
 COPY go.mod go.mod
-COPY go.sum go.sum
-
 RUN go mod download
-RUN go mod tidy
 
 #
 #
@@ -167,13 +150,13 @@ RUN echo "rtmgrapi ${RTMGRVERSION} https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr"
 COPY pkg pkg
 COPY cmd cmd
 
+COPY go.sum go.sum
+RUN go mod tidy
+
 RUN mkdir -p /opt/bin && \
     go build -o /opt/bin/submgr cmd/submgr.go && \
     mkdir -p /opt/build/container/usr/local
 
-
-RUN go mod tidy
-
 RUN cp go.mod go.sum /manifests/
 RUN grep gerrit /manifests/go.sum > /manifests/go_gerrit.sum
 
@@ -187,15 +170,26 @@ ENV RMR_SEED_RT=/opt/submgr/test/uta_rtg.rt
 #ENV CGO_LDFLAGS="-fsanitize=address"
 #ENV CGO_CFLAGS="-fsanitize=address"
 
-RUN go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control 
-RUN go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
+#
+# To get debug from rmr
+#
+#RUN echo 5 >  /opt/submgr/level
+#RUN RMR_VCTL_FILE=/opt/submgr/level go test -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control 
+
+#
+# go tests. comment out ipv6 localhost if exist when tests are executed.
+#
+RUN sed -r  "s/^(::1.*)/#\1/" /etc/hosts  > /etc/hosts.new \
+    && cat /etc/hosts.new > /etc/hosts \
+    && cat /etc/hosts  \
+    && go test -failfast -test.coverprofile /tmp/submgr_cover.out -count=1 -v ./pkg/control \
+    && go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html    
 
 # test formating (not important)
 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)"
 
 
 ###########################################################
@@ -206,7 +200,6 @@ FROM ubuntu:18.04
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump
 
 COPY --from=submgrbuild /manifests /manifests
-
 COPY --from=submgrbuild /opt/bin/submgr /
 COPY --from=submgrbuild /usr/local/include /usr/local/include
 COPY --from=submgrbuild /usr/local/lib /usr/local/lib
@@ -220,5 +213,4 @@ COPY config /opt/config
 ENV CFG_FILE=/opt/config/submgr-config.yaml
 ENV RMR_SEED_RT=/opt/config/submgr-uta-rtg.rt
 
-
 ENTRYPOINT ["/submgr"]