From c5c8679a5dd17c794f58213bd28b25582d351164 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 7 Aug 2019 09:27:18 -0400 Subject: [PATCH] Upgrade RMR to v 1.0.45 in alpine builder image Add instructions about /usr/local/lib, /usr/local/lib64 Signed-off-by: Lott, Christopher (cl778h) Change-Id: I56d6d780302e2224f6369fe497e571758c633a49 --- docker/bldr-alpine3/Dockerfile | 8 +++++--- docker/bldr-alpine3/container-tag.yaml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 docker/bldr-alpine3/Dockerfile diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile old mode 100755 new mode 100644 index f37bb27e..44abe56b --- a/docker/bldr-alpine3/Dockerfile +++ b/docker/bldr-alpine3/Dockerfile @@ -24,9 +24,11 @@ # mdc log library (libmdclog.so, libmdbclog.so.X.X.X; see below for pinned version) # rmr library (librmr_nng.so, libmdclog.so..X.X.X; see below for pinned version) # How to get a library file from this Docker base image: -# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib64/libnng.so.X.X.X /usr/local/lib64 +# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib64/libnng.so.X.X.X /usr/local/lib +# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib64/librmr_nng.so.X.X.X /usr/local/lib # COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib/libmdclog.so.X.X.X /usr/local/lib -# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib/librmr_nng.so.X.X.X /usr/local/lib +# Some packages install to /usr/local/lib, others to /usr/local/lib64 +# Alpine by default searches /usr/local/lib but not /usr/local/lib64 FROM python:3.7-alpine RUN apk update && apk add \ @@ -69,7 +71,7 @@ RUN cd /tmp \ # RMR, version is pinned RUN cd /tmp \ - && git clone --branch 1.0.36 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ + && git clone --branch 1.0.45 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ && cd rmr \ && mkdir build \ && cd build \ diff --git a/docker/bldr-alpine3/container-tag.yaml b/docker/bldr-alpine3/container-tag.yaml index 414e8397..40b73b94 100644 --- a/docker/bldr-alpine3/container-tag.yaml +++ b/docker/bldr-alpine3/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 1-a3.9 +tag: 2-a3.9 -- 2.16.6