From e0724c39e0bbf99a62c3895e25a9d36b0e82800d Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 7 May 2020 13:07:16 -0400 Subject: [PATCH] Use xappframepy ver 1.1.1 or later Pin version for xappframepy in setup.py Upgrade to RMR ver 4.0.5 in Dockerfile Signed-off-by: Lott, Christopher (cl778h) Change-Id: I6bb3289be4ffc89ec3ab14e99c872e30db4f083f --- Dockerfile | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ecbf1c0..e042d4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,9 @@ FROM python:3.8-alpine # RMR setup RUN mkdir -p /opt/route/ # copy rmr files from builder image in lieu of an Alpine package -COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.2 /usr/local/lib64/librmr* /usr/local/lib64/ +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/lib64/librmr* /usr/local/lib64/ # rmr_probe replaced health_ck -COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.2 /usr/local/bin/rmr* /usr/local/bin/ +COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/bin/rmr* /usr/local/bin/ ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64 COPY tests/fixtures/local.rt /opt/route/local.rt ENV RMR_SEED_RT /opt/route/local.rt diff --git a/setup.py b/setup.py index 51db1f4..81daddf 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( author="Tommy Carpenter", description="QP Driver Xapp for traffic steering", url="https://gerrit.o-ran-sc.org/r/admin/repos/ric-app/qp-driver", - install_requires=["ricxappframe>=1.0.0,<2.0.0"], + install_requires=["ricxappframe>=1.1.1,<2.0.0"], entry_points={"console_scripts": ["start.py=qpdriver.main:start"]}, # adds a magical entrypoint for Docker license="Apache 2.0", data_files=[("", ["LICENSE.txt"])], -- 2.16.6