In RMR image, upgrade to version 3.8.2 and include /usr/local/bin
In alpine3 image, drop RMR entirely
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I55271b5e72aa79b7ecde38e2c8de8e1900f45a43
# See list of available files below. Use the following command to copy a file
# in a Docker build, after replacing "TAG" with the desired version string:
#
# See list of available files below. Use the following command to copy a file
# in a Docker build, after replacing "TAG" with the desired version string:
#
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-rmr:TAG /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
+# COPY --from=nexus3.o-ran-sc.org:10002/bldr-alpine3-rmr:TAG /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
+#
+# /usr/local/bin:
+# health_ck
+# rmr_probe
#
# /usr/local/include/rmr:
# RIC_message_types.h
#
# /usr/local/include/rmr:
# RIC_message_types.h
# librmr_nng.a
# librmr_nng.so
# librmr_nng.so.3 (subject to version change)
# librmr_nng.a
# librmr_nng.so
# librmr_nng.so.3 (subject to version change)
-# librmr_nng.so.3.8.0 (subject to version change)
+# librmr_nng.so.3.8.2 (subject to version change)
# librmr_si.a
# librmr_si.so
# librmr_si.so.3 (subject to version change)
# librmr_si.a
# librmr_si.so
# librmr_si.so.3 (subject to version change)
-# librmr_si.so.3.8.0 (subject to version change)
+# librmr_si.so.3.8.2 (subject to version change)
FROM alpine:3.11 as bldr
RUN apk update && apk add autoconf automake build-base cmake libtool pkgconfig git sudo
FROM alpine:3.11 as bldr
RUN apk update && apk add autoconf automake build-base cmake libtool pkgconfig git sudo
-RUN git clone --branch 3.8.0 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
+RUN git clone --branch 3.8.2 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
&& cd rmr \
&& mkdir .build; cd .build \
&& echo "<<<installing rmr devel headers>>>" \
&& cd rmr \
&& mkdir .build; cd .build \
&& echo "<<<installing rmr devel headers>>>" \
&& cmake .. -DDEV_PKG=0; make install
FROM scratch
&& cmake .. -DDEV_PKG=0; make install
FROM scratch
+COPY --from=bldr /usr/local/bin /usr/local/bin
COPY --from=bldr /usr/local/include/rmr /usr/local/include/rmr
COPY --from=bldr /usr/local/lib64 /usr/local/lib64
COPY --from=bldr /usr/local/include/rmr /usr/local/include/rmr
COPY --from=bldr /usr/local/lib64 /usr/local/lib64
# golang v 1.13.4
# python 3.7
# mdc log libs (libmdclog.so, libmdbclog.so.X.X.X; see below for pinned version)
# golang v 1.13.4
# python 3.7
# mdc log libs (libmdclog.so, libmdbclog.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
#
# 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
&& ./configure \
&& make \
&& make install
&& ./configure \
&& make \
&& make install
-
-# 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.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 .. -DDEV_PKG=0; make install
+
\ No newline at end of file
# Not feasible to show all the software versions
---
# Not feasible to show all the software versions
---