Upgrade RMR to v4.7.4

[ric-plt/submgr.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 67fd2e4..5276ea5 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@
 ###########################################################
 #
 ###########################################################
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 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
 
@@ -57,7 +57,7 @@ RUN export GOBIN=/usr/local/bin/ ; \
 #
 # RMR
 #
-ARG RMRVERSION=4.0.2
+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
@@ -93,6 +93,7 @@ RUN cd 3rdparty/E2AP-v01.00.00 && \
 
 RUN echo "E2AP         E2AP-v01.00.00" >> /manifests/versions.txt
 
+
 COPY e2ap e2ap
 RUN cd e2ap/libe2ap_wrapper && \
     gcc -c ${CFLAGS} -g -fPIC *.c  && \
@@ -120,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
 
 #
 #
@@ -152,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
 
@@ -172,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 -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)"
 
 
 ###########################################################
@@ -191,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