From: wahidw Date: Tue, 10 Dec 2019 05:02:10 +0000 (+0000) Subject: Taking RMR version that has meid implementation X-Git-Tag: 0.4.9~8 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=5e864c742292fcaa70992406dd7e0cea3fdc80a7;p=ric-plt%2Frtmgr.git Taking RMR version that has meid implementation Change-Id: I991be0a69e6a1d5d61539628b150fa124a75f6b3 Signed-off-by: wahidw --- diff --git a/Dockerfile b/Dockerfile index 782bc5f..e69fc75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,11 +25,10 @@ #FROM golang:1.12.1 as rtmgrbuild FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:2-u18.04-nng as rtmgrbuild - # Install RMr shared library -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.9.0_amd64.deb/download.deb && dpkg -i rmr_1.9.0_amd64.deb && rm -rf rmr_1.9.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.10.2_amd64.deb/download.deb && dpkg -i rmr_1.10.2_amd64.deb && rm -rf rmr_1.10.2_amd64.deb # Install RMr development header files -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.9.0_amd64.deb/download.deb && dpkg -i rmr-dev_1.9.0_amd64.deb && rm -rf rmr-dev_1.9.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.10.2_amd64.deb/download.deb && dpkg -i rmr-dev_1.10.2_amd64.deb && rm -rf rmr-dev_1.10.2_amd64.deb ENV GOLANG_VERSION 1.12.1 RUN wget --quiet https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \ @@ -83,7 +82,7 @@ COPY --from=rtmgrbuild /usr/local/include /usr/local/include COPY --from=rtmgrbuild /usr/local/lib /usr/local/lib RUN ldconfig -RUN apt update && apt install -y iputils-ping net-tools curl tcpdump +RUN apt-get update && apt-get install -y iputils-ping net-tools curl tcpdump RUN mkdir /db && touch /db/rt.json && chmod 777 /db/rt.json RUN chmod 755 /run_rtmgr.sh CMD /run_rtmgr.sh diff --git a/RELNOTES b/RELNOTES index 3b83ac3..a5fb036 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,3 +1,6 @@ +### v0.4.3 +* Included RMR changes that has MEID implementation + ### v0.4.2 * Added Routes when AC-xApp is deployed * included xapp-framework. Using only config and Logger module for now. diff --git a/container-tag.yaml b/container-tag.yaml index 66a2515..2af355a 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 0.4.2 +tag: 0.4.3 diff --git a/go.mod b/go.mod index e6a1f6e..702d00c 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.12.1 require ( gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.0.20 + nanomsg.org/go/mangos/v2 v2.0.5 ) replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.2.0 @@ -11,3 +12,5 @@ replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdl replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.0.20 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.1 + +replace nanomsg.org/go/mangos/v2 => nanomsg.org/go/mangos/v2 v2.0.5