Small tuning

[ric-plt/submgr.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index b7adf64..939e0a3 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,23 +36,40 @@ WORKDIR /tmp
 ##RUN cd asn1c && make check
 #RUN cd asn1c && make install
 
-
-ARG RMRVERSION=3.2.4
-# 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
-
-# "Installing Swagger"
-RUN 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 \
-    && mkdir -p /root/.go/bin \
-    && mv swagger /root/.go/bin
+    && 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
+
+
+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
 
-ENV GOPATH=/root/.go
-ENV PATH=$PATH:/root/.go/bin
-RUN go get -u github.com/go-delve/delve/cmd/dlv
 
 WORKDIR /opt/submgr
 
@@ -73,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  && \
@@ -124,6 +145,8 @@ RUN mkdir -p /root/go && \
     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
+
 #
 #
 #
@@ -137,15 +160,17 @@ RUN mkdir -p /opt/bin && \
 
 RUN go mod tidy
 
+RUN cp go.mod go.sum /manifests/
+RUN grep gerrit /manifests/go.sum > /manifests/go_gerrit.sum
+
+
 # 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 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 go tool cover -html=/tmp/submgr_cover.out -o /tmp/submgr_cover.html
 
 # test formating (not important)
@@ -163,6 +188,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