From afce796cd2ec96ca677f43b95c27abfcc7f969f4 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 23 Apr 2020 12:58:00 -0400 Subject: [PATCH] Drop MDCLog from Alpine3 base builder image The MDCLog files are available from the bldr-alpine3-mdclog image in the release registry. Splitting things apart should reduce the version (tag) churn of these builder images. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Iebbbc7af947b0d2c62b5f23a6c0ee501188510a6 --- bldr-imgs/bldr-alpine3/Dockerfile | 24 +++--------------------- bldr-imgs/bldr-alpine3/container-tag.yaml | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/bldr-imgs/bldr-alpine3/Dockerfile b/bldr-imgs/bldr-alpine3/Dockerfile index e410a9f..8c2ad17 100644 --- a/bldr-imgs/bldr-alpine3/Dockerfile +++ b/bldr-imgs/bldr-alpine3/Dockerfile @@ -14,19 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This is an all-things-to-all-ORAN-people build image with: -# alpine v 3.11 +# This is an all-things-to-all-ORAN-people Alpine 3.11 build image with: # gcc/g++ v 8 -# golang v 1.13.4 +# golang v 1.13.x # python 3.7 -# mdc log libs (libmdclog.so, libmdbclog.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/librmr_si.so.X.X.X /usr/local/lib +# ORAN libraries are not provided here to reduce version churn FROM python:3.7-alpine RUN apk update && apk add \ @@ -48,13 +40,3 @@ RUN cd /tmp \ && git clone --branch v2015.09.25 git://git.sv.gnu.org/autoconf-archive.git \ && cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \ && rm -rf /tmp/autoconf-archive - -# MCDLOG, version is pinned -RUN cd /tmp \ - && git clone --branch v0.0.4 https://gerrit.o-ran-sc.org/r/com/log \ - && cd log \ - && ./autogen.sh \ - && ./configure \ - && make \ - && 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 03402e4..a8e11aa 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: 11-a3.11 +tag: 12-a3.11 -- 2.16.6