X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=94b826b42a718ea86d25a2e0b474f1337b5223bf;hb=refs%2Fchanges%2F76%2F3476%2F2;hp=b49723c01e02623ed9737310d607cf3d88323b25;hpb=429cfe6e2302ee69e067402489660f8e22319eeb;p=ric-plt%2Fsubmgr.git

diff --git a/Dockerfile b/Dockerfile
index b49723c..94b826b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@
 ###########################################################
 #
 ###########################################################
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as submgrcore
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:6-u18.04-nng 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=3.6.2
+ARG RMRVERSION=3.6.5
 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
@@ -83,16 +83,30 @@ ENV CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 ENV CGO_CFLAGS="-DASN_DISABLE_OER_SUPPORT"
 
 COPY 3rdparty 3rdparty
-RUN cd 3rdparty/libe2ap && \
+RUN cd 3rdparty/E2AP-v01.00.00 && \
     gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
     gcc *.o -g -shared -o libe2ap.so && \
     cp libe2ap.so /usr/local/lib/ && \
     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
+RUN cd 3rdparty/E2SM-gNB-NRT_V4.0.1 && \
+    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
+    gcc *.o -g -shared -o libgnbnrt.so && \
+    cp libgnbnrt.so /usr/local/lib/ && \
+    cp *.h /usr/local/include/ && \
+    ldconfig
+
+RUN cd 3rdparty/E2SM-gNB-X2-V4.0.1 && \
+    gcc -c ${CFLAGS} -I. -g -fPIC *.c  && \
+    gcc *.o -g -shared -o libgnbx2.so && \
+    cp libgnbx2.so /usr/local/lib/ && \
+    cp *.h /usr/local/include/ && \
+    ldconfig
+
+RUN echo "E2AP         E2AP-v01.00.00" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-NRT E2SM-gNB-NRT_V4.0.1" >> /manifests/versions.txt
+RUN echo "E2SM-gNB-X2  E2SM-gNB-X2-V4.0.1" >> /manifests/versions.txt
 
 COPY e2ap e2ap
 RUN cd e2ap/libe2ap_wrapper && \
@@ -126,8 +140,6 @@ COPY go.sum go.sum
 RUN go mod download
 RUN go mod tidy
 
-RUN cp go.mod go.sum /manifests/
-
 #
 #
 #
@@ -162,17 +174,20 @@ 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
+#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
 
 # test formating (not important)
@@ -192,11 +207,18 @@ 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
 COPY --from=submgrbuild /usr/local/lib /usr/local/lib
 RUN ldconfig
 
+COPY run_submgr.sh /
 RUN chmod 755 /run_submgr.sh
-CMD /run_submgr.sh
+
+#default config
+COPY config /opt/config
+ENV CFG_FILE=/opt/config/submgr-config.yaml
+ENV RMR_SEED_RT=/opt/config/submgr-uta-rtg.rt
+
+
+ENTRYPOINT ["/submgr"]