X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker%2Fbldr-alpine3%2FDockerfile;h=499e1675848a3de40046c05cbfb2a6dec3545e62;hb=refs%2Fchanges%2F06%2F1406%2F1;hp=f37bb27ec3c9f0e736a4b9483e3990777304e663;hpb=d905642612e7697fac43a8ecf4c84947a9a67245;p=ci-management.git

diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile
old mode 100755
new mode 100644
index f37bb27e..499e1675
--- 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 \
@@ -48,10 +50,13 @@ RUN cd /tmp \
     && cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \
     && rm -rf /tmp/autoconf-archive
 
-# NNG, version is pinned
+# NNG repo is not frequently tagged so it's pinned to a commit hash.
+# This commit provides fix to the proxy-reconnect
+# bug that we identified:  https://github.com/nanomsg/nng/issues/970
 RUN cd /tmp \
-    && git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \
+    && git clone https://github.com/nanomsg/nng.git \
     && cd nng \
+    && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
     && mkdir build \
     && cd build \
     && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
@@ -69,7 +74,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.3.0 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
     && cd rmr \
     && mkdir build \
     && cd build \