Merge "Extend ubuntu 18 bldr with cmake, ksh, alien"

diff --git a/bldr-imgs/bldr-alpine3-mdclog/Dockerfile b/bldr-imgs/bldr-alpine3-mdclog/Dockerfile
new file mode 100644 (file)
index 0000000..f56882f
--- /dev/null
+++ b/bldr-imgs/bldr-alpine3-mdclog/Dockerfile
@@ -0,0 +1,56 @@
+# O-RAN-SC
+#
+# Copyright (C) 2019-2020 AT&T Intellectual Property and Nokia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Provides MDCLOG for Alpine including header files and shared-object libraries,
+# basically a workaround for missing APK support at PackageCloud.io.
+# Unlike other bldr- images, this only has library files, no build tools.
+# 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:10002/bldr-alpine3-mdclog:TAG /usr/local/lib/libmdclog.so /usr/local/lib/libmdclog.so
+#
+# /usr/local/include/mdclog:
+#     mdclog.h
+#
+# /usr/local/lib:
+#     libmdclog.a
+#     libmdclog.la
+#     libmdclog.so
+#     libmdclog.so.0         (subject to version change)
+#     libmdclog.so.0.0.4     (ditto)
+
+FROM alpine:3.11 as bldr
+RUN apk update && apk add autoconf automake build-base cmake libtool pkgconfig git sudo
+
+# the autoconf-archive in alpine's edge repos is too new
+# for our purposes, so we'll use one from the source.
+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
+
+FROM scratch
+COPY --from=bldr /usr/local/include/mdclog /usr/local/include/mdclog
+COPY --from=bldr /usr/local/lib/libmdclog.* /usr/local/lib/

diff --git a/bldr-imgs/bldr-alpine3-mdclog/container-tag.yaml b/bldr-imgs/bldr-alpine3-mdclog/container-tag.yaml
new file mode 100644 (file)
index 0000000..6f59723
--- /dev/null
+++ b/bldr-imgs/bldr-alpine3-mdclog/container-tag.yaml
@@ -0,0 +1,3 @@
+# Version of the com/log aka MDCLog library
+---
+tag: 0.0.4

diff --git a/bldr-imgs/bldr-alpine3-rmr/Dockerfile b/bldr-imgs/bldr-alpine3-rmr/Dockerfile
index cbae8e7..96dc8f5 100755 (executable)
--- a/bldr-imgs/bldr-alpine3-rmr/Dockerfile
+++ b/bldr-imgs/bldr-alpine3-rmr/Dockerfile
@@ -24,7 +24,6 @@
 # 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:
@@ -34,18 +33,14 @@
 #     rmr_symtab.h
 #
 # /usr/local/lib64:
-#     librmr_nng.a
-#     librmr_nng.so
-#     librmr_nng.so.3        (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.2     (subject to version change)
+#     librmr_si.so.4         (subject to version change)
+#     librmr_si.so.4.0.0     (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.2 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
+RUN git clone --branch 4.0.0 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
     && cd rmr \
     && mkdir .build; cd .build \
     && echo "<<<installing rmr devel headers>>>" \
@@ -54,6 +49,6 @@ RUN git clone --branch 3.8.2 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/bin/rmr* /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/lib64/librmr* /usr/local/lib64/

diff --git a/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml b/bldr-imgs/bldr-alpine3-rmr/container-tag.yaml
index fca1701..fbbaa3f 100644 (file)
--- 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.2
+tag: 4.0.0

diff --git a/releases/alpine3-rmr-container.yaml b/releases/alpine3-rmr-container.yaml
index 577ecaa..5eb098e 100644 (file)
--- a/releases/alpine3-rmr-container.yaml
+++ b/releases/alpine3-rmr-container.yaml
@@ -1,10 +1,11 @@
 ---
 distribution_type: container
-container_release_tag: 3.8.2
+container_release_tag: 4.0.0
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: it/dev
-ref: 6437448915de20938eecbaf2422d428209ac959c
+ref: cd23da7e93dfcca381b03379be2f30b710f5426c
+tag_release: false
 containers:
     - name: bldr-alpine3-rmr
-      version: 3.8.2
+      version: 4.0.0