Drop NNG library from all base build images

[it/dev.git] / bldr-imgs / bldr-alpine3 / Dockerfile

diff --git a/bldr-imgs/bldr-alpine3/Dockerfile b/bldr-imgs/bldr-alpine3/Dockerfile
index 6e3268a..ff79dea 100644 (file)
--- a/bldr-imgs/bldr-alpine3/Dockerfile
+++ b/bldr-imgs/bldr-alpine3/Dockerfile
@@ -20,16 +20,13 @@
 # golang v 1.13.4
 # python 3.7
 # mdc log libs (libmdclog.so, libmdbclog.so.X.X.X; see below for pinned version)
-# nng libs (rmr.h, libnng.so, libnng.so.X.X.X; version pinned by RMR)
-# rmr libs (librmr_nng.so, librmr_si.so, librmr_nng.so.X.X.X, librmr_si.so.X.X.X; see below for pinned version)
+# rmr libs (librmr_si.so, librmr_si.so.X.X.X; see below for pinned version)
 #
 # Some packages (e.g., mdclog) install to /usr/local/lib, others (e.g., rmr) install to /usr/local/lib64
 # Alpine by default searches /usr/local/lib but not /usr/local/lib64
 #
 # How to get library files from this Docker base image:
 # COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:TAG /usr/local/lib/libmdclog.so.X.X.X    /usr/local/lib
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:TAG /usr/local/lib64/libnng.so.X.X.X     /usr/local/lib
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:TAG /usr/local/lib64/librmr_nng.so.X.X.X /usr/local/lib
 # COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:TAG /usr/local/lib64/librmr_si.so.X.X.X  /usr/local/lib
 
 FROM python:3.7-alpine
@@ -65,10 +62,10 @@ RUN cd /tmp \
 # install a well known working rmr including development header files,
 # which uses a submodule to install NNG at a known commit
 RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git sudo
-RUN git clone --branch 3.6.3 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
+RUN git clone --branch 3.7.1 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
     && cd rmr \
     && mkdir .build; cd .build \
     && echo "<<<installing rmr devel headers>>>" \
     && cmake .. -DDEV_PKG=1; make install \
     && echo "<<< installing rmr .so>>>" \
-    && cmake .. -DPACK_EXTERNALS=1; make install
+    && cmake .. -DDEV_PKG=0; make install