X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bldr-imgs%2Fbldr-alpine3%2FDockerfile;fp=bldr-imgs%2Fbldr-alpine3%2FDockerfile;h=ff79dea224558d639497dd5b838cb5509efc93db;hb=873846987e07978e790f264341c58699c5c8dfb0;hp=6e3268a9b39700579e676f0b5ccd4fdf0a89cf72;hpb=7ba8cd1c09cd59ece9925d21b87f7d64f2272ad8;p=it%2Fdev.git diff --git a/bldr-imgs/bldr-alpine3/Dockerfile b/bldr-imgs/bldr-alpine3/Dockerfile index 6e3268a..ff79dea 100644 --- 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 "<<>>" \ && cmake .. -DDEV_PKG=1; make install \ && echo "<<< installing rmr .so>>>" \ - && cmake .. -DPACK_EXTERNALS=1; make install + && cmake .. -DDEV_PKG=0; make install