X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=721f1582170d2e33d3b885e7137298f9c35f5c95;hb=24f80f45e026915e780626b33e87588147d66df8;hp=ad981f7924231ec29e4297f9ef2670f80ef653d2;hpb=bff605acf6e749b334c4dc737ca90fbad21a1618;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index ad981f7..721f158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,23 @@
 ###########################################################
 #
 ###########################################################
-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
+
+ARG g14="1.14.4"
+ARG GOVERSION="1.14"
+RUN wget -nv https://dl.google.com/go/go${g14}.linux-amd64.tar.gz \
+     && tar -xf go${g14}.linux-amd64.tar.gz \
+     && mv go /opt/go/${GOVERSION} \
+     && rm -f go*.gz
+
+ENV DEFAULTPATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH=$DEFAULTPATH:/usr/local/go/bin:/opt/go/${GOVERSION}/bin:/root/go/bin
+
+# Update CA certificates
+RUN apt update && apt install --reinstall -y \
+  ca-certificates \
+  && \
+  update-ca-certificates
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind
 
@@ -57,9 +73,9 @@ RUN export GOBIN=/usr/local/bin/ ; \
 #
 # RMR
 #
-ARG RMRVERSION=4.4.4
-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
@@ -121,10 +137,7 @@ FROM submgre2apbuild as submgrbuild
 #
 #
 COPY go.mod go.mod
-COPY go.sum go.sum
-
 RUN go mod download
-RUN go mod tidy
 
 #
 #
@@ -153,13 +166,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
 
@@ -185,8 +198,8 @@ ENV RMR_SEED_RT=/opt/submgr/test/uta_rtg.rt
 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
+    && 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)"
@@ -198,15 +211,15 @@ RUN test -z "$(gofmt -l pkg/teststube2ap/*.go)"
 ###########################################################
 #
 ###########################################################
-FROM ubuntu:18.04 as submgr
+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
+COPY --from=submgrbuild /usr/local/include/rmr /usr/local/include/
+COPY --from=submgrbuild /usr/local/lib/librmr* /usr/local/lib/
+COPY --from=submgrbuild /usr/local/lib/libe2ap* /usr/local/lib/
 RUN ldconfig
 
 COPY run_submgr.sh /