From e2e3e435babf3aeb8c1bae14ad2a055d02bee38a Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 22 Apr 2020 09:52:23 -0400 Subject: [PATCH] Upgrade to RMR version 3.8.0 from released image Bump version to 1.0.2 and add release notes Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ie7b9882106b6f6670312f6fa9187191fce104ab8 --- Dockerfile-Unit-Test | 4 ++-- docs/release-notes.rst | 5 +++++ examples/Dockerfile-Ping | 3 ++- examples/Dockerfile-Pong | 3 ++- setup.py | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test index 6a3b348..d509c18 100644 --- a/Dockerfile-Unit-Test +++ b/Dockerfile-Unit-Test @@ -19,8 +19,8 @@ FROM python:3.8-alpine # sdl uses hiredis which needs gcc RUN apk update && apk add gcc musl-dev -# copy rmr .sos from the builder image -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so # Upgrade pip, install tox RUN pip install --upgrade pip && pip install tox diff --git a/docs/release-notes.rst b/docs/release-notes.rst index e3767bc..79cc239 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,6 +14,11 @@ and this project adheres to `Semantic Versioning `__. :depth: 3 :local: +[1.0.2] - 2020-04-22 +-------------------- +* Upgrade to RMR version 3.8.0 + + [1.0.1] - 2020-04-10 -------------------- diff --git a/examples/Dockerfile-Ping b/examples/Dockerfile-Ping index 52ed2fb..2eac495 100644 --- a/examples/Dockerfile-Ping +++ b/examples/Dockerfile-Ping @@ -19,7 +19,8 @@ FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ COPY test_route.rt /opt/route/test_route.rt -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:3-rmr-si95-nng-3.6.1 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 ENV RMR_SEED_RT /opt/route/test_route.rt diff --git a/examples/Dockerfile-Pong b/examples/Dockerfile-Pong index 6cae078..4dfe71d 100644 --- a/examples/Dockerfile-Pong +++ b/examples/Dockerfile-Pong @@ -19,7 +19,8 @@ FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ COPY test_route.rt /opt/route/test_route.rt -COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:3-rmr-si95-nng-3.6.1 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so +# copy rmr .so from builder image in lieu of an Alpine package +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 ENV RMR_SEED_RT /opt/route/test_route.rt diff --git a/setup.py b/setup.py index 68bde4b..e764a2e 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def _long_descr(): setup( name="ricxappframe", - version="1.0.1", + version="1.0.2", packages=find_packages(exclude=["tests.*", "tests"]), author="Tommy Carpenter, E. Scott Daniels", description="Xapp and RMR framework for python", -- 2.16.6