From 8883c13a152bd287aa60462ae858d0a5a45c70cd Mon Sep 17 00:00:00 2001 From: idanshal Date: Thu, 12 Mar 2020 18:37:44 +0200 Subject: [PATCH] Update Rmr Version and Dockerfile Change-Id: Ia212c126af4baadfc8950bd023a6218e6c7ea463 Signed-off-by: idanshal --- E2Manager/Dockerfile | 12 ++++++------ E2Manager/container-tag.yaml | 2 +- E2Manager/rmrCgo/rmrCgoApi.go | 2 +- E2Manager/rmrCgo/rmrCgoTypes.go | 2 +- E2Manager/rmrCgo/rmrCgoUtils.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile index 1726158..aa635fc 100644 --- a/E2Manager/Dockerfile +++ b/E2Manager/Dockerfile @@ -27,10 +27,10 @@ COPY . . ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin #RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr && cd rmr/; mkdir build; cd build; /opt/bin/cmake -DDEV_PKG=1 ..; make install # Install RMr library and dev files -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_3.3.0_amd64.deb/download.deb -RUN dpkg -i rmr_3.3.0_amd64.deb -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.3.0_amd64.deb/download.deb -RUN dpkg -i rmr-dev_3.3.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_3.5.1_amd64.deb/download.deb +RUN dpkg -i rmr_3.5.1_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.5.1_amd64.deb/download.deb +RUN dpkg -i rmr-dev_3.5.1_amd64.deb RUN cd 3rdparty/asn1codec && make RUN go build app/main.go @@ -60,8 +60,8 @@ COPY --from=ubuntu /opt/E2Manager/router.txt /opt/E2Manager/router.txt COPY --from=ubuntu /opt/E2Manager/main /opt/E2Manager/main COPY --from=ubuntu /opt/E2Manager/resources/configuration.yaml /opt/E2Manager/resources/configuration.yaml COPY --from=ubuntu /opt/E2Manager/resources/rmr.verbose /tmp/rmr.verbose -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.1 /usr/local/lib/librmr_nng.so.1 -COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.3 /usr/local/lib/librmr_si.so.3 + WORKDIR /opt/E2Manager ENV LD_LIBRARY_PATH=/usr/local/lib \ port=3800 diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml index 8202cd0..d2a66d2 100644 --- a/E2Manager/container-tag.yaml +++ b/E2Manager/container-tag.yaml @@ -1,4 +1,4 @@ # The Jenkins job requires a tag to build the Docker image. # Global-JJB script assumes this file is in the repo root. --- -tag: 3.0.5.1 +tag: 4.0.2 diff --git a/E2Manager/rmrCgo/rmrCgoApi.go b/E2Manager/rmrCgo/rmrCgoApi.go index 308ab63..d247efb 100644 --- a/E2Manager/rmrCgo/rmrCgoApi.go +++ b/E2Manager/rmrCgo/rmrCgoApi.go @@ -20,7 +20,7 @@ package rmrCgo -// #cgo LDFLAGS: -L/usr/local/lib -lrmr_nng -lnng +// #cgo LDFLAGS: -L/usr/local/lib -lrmr_si // #include // #include import "C" diff --git a/E2Manager/rmrCgo/rmrCgoTypes.go b/E2Manager/rmrCgo/rmrCgoTypes.go index 4875e1e..d7dcbef 100644 --- a/E2Manager/rmrCgo/rmrCgoTypes.go +++ b/E2Manager/rmrCgo/rmrCgoTypes.go @@ -20,7 +20,7 @@ package rmrCgo -// #cgo LDFLAGS: -L/usr/local/lib -lrmr_nng -lnng +// #cgo LDFLAGS: -L/usr/local/lib -lrmr_si // #include // #include // #include diff --git a/E2Manager/rmrCgo/rmrCgoUtils.go b/E2Manager/rmrCgo/rmrCgoUtils.go index ca29747..8b895c0 100644 --- a/E2Manager/rmrCgo/rmrCgoUtils.go +++ b/E2Manager/rmrCgo/rmrCgoUtils.go @@ -20,7 +20,7 @@ package rmrCgo -// #cgo LDFLAGS: -L/usr/local/lib -lrmr_nng -lnng +// #cgo LDFLAGS: -L/usr/local/lib -lrmr_si // #include // #include import "C" -- 2.16.6