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) <cl778h@att.com>
Change-Id: I56d6d780302e2224f6369fe497e571758c633a49

diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile
old mode 100755 (executable)
new mode 100644 (file)
index f37bb27..44abe56
--- 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 414e839..40b73b9 100644 (file)
--- 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