X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=d51ab1d9b484622861d182d476fc70f74087ba05;hb=HEAD;hp=4b41bd41947d19a08165e262674416fd4bdbbf5f;hpb=c92b421ec9f89e77df36422987e478ed8db85299;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index 4b41bd4..7d59ceb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,17 @@
 ###########################################################
 #
 ###########################################################
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as submgrcore
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.0.0 as submgrcore
+
+ARG GOVERSION="1.18.5"
+RUN wget -nv https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz \
+     && tar -xf go${GOVERSION}.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
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind
 
@@ -50,14 +60,12 @@ RUN wget --quiet ${SWAGGERURL} \
 # GO DELVE
 #
 RUN export GOBIN=/usr/local/bin/ ; \
-    go get -u github.com/go-delve/delve/cmd/dlv \
-    && go install github.com/go-delve/delve/cmd/dlv
-
+  go install github.com/go-delve/delve/cmd/dlv@latest
 
 #
 # RMR
 #
-ARG RMRVERSION=4.4.6
+ARG RMRVERSION=4.9.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
@@ -65,7 +73,7 @@ RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd
 RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb
 
 
-RUN mkdir /manifests/
+RUN mkdir -p /manifests/
 RUN echo "rmrlib ${RMRVERSION} ${RMRLIBURL}" >> /manifests/versions.txt
 RUN echo "rmrdev ${RMRVERSION} ${RMRDEVURL}" >> /manifests/versions.txt
 RUN echo "swagger ${SWAGGERVERSION} ${SWAGGERURL}" >> /manifests/versions.txt
@@ -83,7 +91,7 @@ ENV CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 ENV CGO_CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 
 COPY 3rdparty 3rdparty
-RUN cd 3rdparty/E2AP-v01.00.00 && \
+RUN cd 3rdparty/E2AP-v02.00.00 && \
     gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
     gcc *.o -g -shared -o libe2ap.so && \
     cp libe2ap.so /usr/local/lib/ && \
@@ -91,7 +99,7 @@ RUN cd 3rdparty/E2AP-v01.00.00 && \
     ldconfig
 
 
-RUN echo "E2AP         E2AP-v01.00.00" >> /manifests/versions.txt
+RUN echo "E2AP         E2AP-v02.00.00" >> /manifests/versions.txt
 
 
 COPY e2ap e2ap
@@ -121,10 +129,7 @@ FROM submgre2apbuild as submgrbuild
 #
 #
 COPY go.mod go.mod
-COPY go.sum go.sum
-
 RUN go mod download
-RUN go mod tidy
 
 #
 #
@@ -132,15 +137,12 @@ RUN go mod tidy
 RUN mkdir pkg
 COPY api api
 
-
-ARG RTMGRVERSION=cd7867c8f527f46fd8702b0b8d6b380a8e134bea
-
+ARG RTMGRVERSION=8becf0c4e06bc89b13d217a102eb7a50470cddc5
 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 && \
     swagger generate client -f api/routing_manager.yaml -t pkg/ -m rtmgr_models -c rtmgr_client
 
@@ -153,13 +155,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
 
@@ -179,14 +181,15 @@ ENV RMR_SEED_RT=/opt/submgr/test/uta_rtg.rt
 #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 
 
+#Temporarily not running tests as modifying /etc/hosts is not possible.
 #
 # 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
+#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)"
@@ -198,15 +201,15 @@ RUN test -z "$(gofmt -l pkg/teststube2ap/*.go)"
 ###########################################################
 #
 ###########################################################
-FROM ubuntu:18.04
+FROM ubuntu:20.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 /