From 6437448915de20938eecbaf2422d428209ac959c Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 22 Apr 2020 09:30:40 -0400 Subject: [PATCH] Improve alpine base builder images 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) Change-Id: I55271b5e72aa79b7ecde38e2c8de8e1900f45a43 --- bldr-imgs/bldr-alpine3-rmr/Dockerfile | 13 +++++++++---- bldr-imgs/bldr-alpine3-rmr/container-tag.yaml | 2 +- bldr-imgs/bldr-alpine3/Dockerfile | 13 +------------ bldr-imgs/bldr-alpine3/container-tag.yaml | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) mode change 100644 => 100755 bldr-imgs/bldr-alpine3-rmr/Dockerfile diff --git a/bldr-imgs/bldr-alpine3-rmr/Dockerfile b/bldr-imgs/bldr-alpine3-rmr/Dockerfile old mode 100644 new mode 100755 index dba5f5f..cbae8e7 --- a/bldr-imgs/bldr-alpine3-rmr/Dockerfile +++ b/bldr-imgs/bldr-alpine3-rmr/Dockerfile @@ -21,7 +21,11 @@ # 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 @@ -33,15 +37,15 @@ # 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.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 -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 "<<>>" \ @@ -50,5 +54,6 @@ RUN git clone --branch 3.8.0 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \ && 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 diff --git a/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml b/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml index 22061ec..fca1701 100644 --- a/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml +++ b/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml @@ -1,2 +1,2 @@ --- -tag: 3.8.0 +tag: 3.8.2 diff --git a/bldr-imgs/bldr-alpine3/Dockerfile b/bldr-imgs/bldr-alpine3/Dockerfile index ff79dea..e410a9f 100644 --- a/bldr-imgs/bldr-alpine3/Dockerfile +++ b/bldr-imgs/bldr-alpine3/Dockerfile @@ -20,7 +20,6 @@ # 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 @@ -58,14 +57,4 @@ RUN cd /tmp \ && ./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 "<<>>" \ - && cmake .. -DDEV_PKG=1; make install \ - && echo "<<< installing rmr .so>>>" \ - && cmake .. -DDEV_PKG=0; make install + \ No newline at end of file diff --git a/bldr-imgs/bldr-alpine3/container-tag.yaml b/bldr-imgs/bldr-alpine3/container-tag.yaml index 2057313..03402e4 100644 --- a/bldr-imgs/bldr-alpine3/container-tag.yaml +++ b/bldr-imgs/bldr-alpine3/container-tag.yaml @@ -1,3 +1,3 @@ # Not feasible to show all the software versions --- -tag: 10-a3.11-rmr3 +tag: 11-a3.11 -- 2.16.6