X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=b90c2fd000dbfeac755946f1bb9f9a6f589bbbb6;hb=c996c56ce5510957e93df391a43534a5a1efd6e4;hp=a7a9157125fa09524469bbb7a44ebf891f53d91d;hpb=f8833cb6a5ff7947214b2a6562d612552bd39779;p=ric-plt%2Fo1.git diff --git a/Dockerfile b/Dockerfile index a7a9157..b90c2fd 100755 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. #---------------------------------------------------------- -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng AS o1mediator-build +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS o1mediator-build RUN apt-get update -y && apt-get install -y jq \ git \ @@ -90,21 +90,17 @@ RUN \ RUN \ cd /opt/dev && \ git clone https://github.com/CESNET/Netopeer2.git && \ - cd Netopeer2/server && mkdir build && cd build && \ + cd Netopeer2 && mkdir build && cd build && \ cmake -DCMAKE_BUILD_TYPE:String="Release" -DNP2SRV_DATA_CHANGE_TIMEOUT=30000 -DNP2SRV_DATA_CHANGE_WAIT=ON .. && \ make -j2 && \ - make install && \ - cd ../../cli && mkdir build && cd build && \ - cmake -DCMAKE_BUILD_TYPE:String="Release" .. && \ - make -j2 && \ make install # ====================================================================== # RMR -ARG RMRVERSION=3.6.3 -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