X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=67fd2e425dd27902bcbbe5f23c1b6cf56708571a;hb=cdc35bff0dd4c41d1e764d3f48efa70d9f33a8f7;hp=f41ee52e1039d80bcfc3e0c3f862c8ffdbc564cc;hpb=f729b4d42142b69979cad0959cb474623a78532b;p=ric-plt%2Fsubmgr.git diff --git a/Dockerfile b/Dockerfile index f41ee52..67fd2e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ########################################################### # ########################################################### -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.04-nng as submgrcore +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as submgrcore RUN apt update && apt install -y iputils-ping net-tools curl tcpdump gdb valgrind @@ -39,7 +39,7 @@ WORKDIR /tmp # # 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 \ @@ -57,9 +57,9 @@ RUN export GOBIN=/usr/local/bin/ ; \ # # 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.0.2 +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 @@ -90,23 +90,8 @@ RUN cd 3rdparty/E2AP-v01.00.00 && \ 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-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 && \ @@ -220,5 +205,4 @@ COPY config /opt/config ENV CFG_FILE=/opt/config/submgr-config.yaml ENV RMR_SEED_RT=/opt/config/submgr-uta-rtg.rt - ENTRYPOINT ["/submgr"]