###########################################################
#
###########################################################
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:6-u18.04-nng 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
#
# Swagger
#
-ARG SWAGGERVERSION=v0.19.0
+ARG SWAGGERVERSION=v0.23.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 \
# 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=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
+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
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 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
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/ && \
cp *.h /usr/local/include/ && \
ldconfig
-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-v02.00.00" >> /manifests/versions.txt
-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 && \
#
#
COPY go.mod go.mod
-COPY go.sum go.sum
-
RUN go mod download
-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
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
#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
+#
+# To get debug from rmr
+#
+#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 -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)"
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)"
###########################################################
#
###########################################################
-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 /
ENV CFG_FILE=/opt/config/submgr-config.yaml
ENV RMR_SEED_RT=/opt/config/submgr-uta-rtg.rt
-
ENTRYPOINT ["/submgr"]
Code Review / ric-plt / submgr.git / blobdiff