X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=b49723c01e02623ed9737310d607cf3d88323b25;hb=refs%2Ftags%2F0.4.0;hp=89811c81f2a86c9a0b66ed6896fd7aacaf99b905;hpb=9f16319f4c5b289c489e667f6a33eb5de6060305;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index 89811c8..b49723c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,32 +20,56 @@
 #	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 submgrcore
+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 valgrind
 
 WORKDIR /tmp
 
-ARG RMRVERSION=1.13.1
-# 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
+#RUN git clone https://github.com/nokia/asn1c.git
+#RUN cd asn1c && test -f configure || autoreconf -iv
+#RUN cd asn1c &&  ./configure
+#RUN cd asn1c && make
+##RUN cd asn1c && make check
+#RUN cd asn1c && make install
 
-# "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 \
+#
+# Swagger
+#
+ARG SWAGGERVERSION=v0.19.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 \
-    && chmod +x swagger
+    && chmod +x swagger \
+    && mv swagger /usr/local/bin/
+
+#
+# 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
+
+
+#
+# RMR
+#
+ARG RMRVERSION=3.6.2
+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
+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
 
 
-ENV GOPATH=/root/.go
-ENV PATH=$PATH:/root/.go/bin
-RUN /usr/local/go/bin/go get -u github.com/go-delve/delve/cmd/dlv
+RUN mkdir /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
+
 
 WORKDIR /opt/submgr
 
@@ -66,6 +90,10 @@ RUN cd 3rdparty/libe2ap && \
     cp *.h /usr/local/include/ && \
     ldconfig
 
+RUN echo "E2AP         ?" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-NRT ?" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-X2  ?" >> /manifests/versions.txt
+
 COPY e2ap e2ap
 RUN cd e2ap/libe2ap_wrapper && \
     gcc -c ${CFLAGS} -g -fPIC *.c  && \
@@ -75,14 +103,14 @@ RUN cd e2ap/libe2ap_wrapper && \
     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)"
 
 
 ###########################################################
@@ -95,7 +123,10 @@ 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 cp go.mod go.sum /manifests/
 
 #
 #
@@ -113,7 +144,10 @@ RUN git clone "https://gerrit.o-ran-sc.org/r/ric-plt/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
+
+
+RUN echo "rtmgrapi ${RTMGRVERSION} https://gerrit.o-ran-sc.org/r/ric-plt/rtmgr" >> /manifests/versions.txt
 
 #
 #
@@ -122,29 +156,31 @@ 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
+COPY test/uta_rtg.rt test/uta_rtg.rt
+ENV RMR_SEED_RT=/opt/submgr/test/uta_rtg.rt 
 
-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 
 
 #-c -o submgr_test
 #RUN ./submgr_test -test.coverprofile /tmp/submgr_cover.out
 
-RUN /usr/local/go/bin/go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
+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 "$(/usr/local/go/bin/gofmt -l pkg/teststub/*.go)"
-RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/teststubdummy/*.go)"
-RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/teststube2ap/*.go)"
-RUN test -z "$(/usr/local/go/bin/gofmt -l pkg/xapptweaks/*.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)"
 
 
 ###########################################################
@@ -154,6 +190,8 @@ FROM ubuntu:18.04
 
 RUN apt update && apt install -y iputils-ping net-tools curl tcpdump
 
+COPY --from=submgrbuild /manifests /manifests
+
 COPY run_submgr.sh /
 COPY --from=submgrbuild /opt/bin/submgr /
 COPY --from=submgrbuild /usr/local/include /usr/local/include