Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Repair docker root directory name
[ci-management.git]
/
docker
/
bldr-alpine3
/
Dockerfile
diff --git
a/docker/bldr-alpine3/Dockerfile
b/docker/bldr-alpine3/Dockerfile
index
c3f3c30
..
38ec73b
100644
(file)
--- a/
docker/bldr-alpine3/Dockerfile
+++ b/
docker/bldr-alpine3/Dockerfile
@@
-1,6
+1,6
@@
# O-RAN-SC
#
# O-RAN-SC
#
-# Copyright (C) 2019 AT&T Intellectual Property and Nokia
+# 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.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-14,21
+14,22
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-# Builder image Alpine 3.9
+# This is an all-things-to-all-ORAN-people build image with:
+# alpine v 3.11
# gcc/g++ v 8
# gcc/g++ v 8
-# golang v 1.1
2
+# golang v 1.1
3.4
# python 3.7
# python 3.7
-# nng library (libnng.so, libnng.so.X.X.X; see below for pinned version)
-# Includes RIC libraries as a distribution path because
-# PackageCloud does not support Alpine .apk (yet):
+# nng library (rmr.h, libnng.so, libnng.so.X.X.X; version pinned by RMR)
# mdc log library (libmdclog.so, libmdbclog.so.X.X.X; see below for pinned version)
# rmr library (librmr_nng.so, libmdclog.so..X.X.X; see below for pinned version)
# mdc log library (libmdclog.so, libmdbclog.so.X.X.X; see below for pinned version)
# rmr library (librmr_nng.so, libmdclog.so..X.X.X; see below for pinned version)
-# How to get a library file from this Docker base image:
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib64/libnng.so.X.X.X /usr/local/lib
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib64/librmr_nng.so.X.X.X /usr/local/lib
-# COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:1-a3.9 /usr/local/lib/libmdclog.so.X.X.X /usr/local/lib
+#
# Some packages install to /usr/local/lib, others to /usr/local/lib64
# Alpine by default searches /usr/local/lib but not /usr/local/lib64
# Some packages install to /usr/local/lib, others 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/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/lib/libmdclog.so.X.X.X /usr/local/lib
FROM python:3.7-alpine
RUN apk update && apk add \
FROM python:3.7-alpine
RUN apk update && apk add \
@@
-40,6
+41,7
@@
RUN apk update && apk add \
ninja \
pkgconfig \
python-dev \
ninja \
pkgconfig \
python-dev \
+ sudo \
git \
go
git \
go
@@
-50,16
+52,6
@@
RUN cd /tmp \
&& cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \
&& rm -rf /tmp/autoconf-archive
&& cp /tmp/autoconf-archive/m4/* /usr/share/aclocal \
&& rm -rf /tmp/autoconf-archive
-# NNG, version is pinned
-RUN cd /tmp \
- && git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \
- && cd nng \
- && mkdir build \
- && cd build \
- && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
- && ninja \
- && ninja install
-
# MCDLOG, version is pinned
RUN cd /tmp \
&& git clone --branch v0.0.4 https://gerrit.o-ran-sc.org/r/com/log \
# MCDLOG, version is pinned
RUN cd /tmp \
&& git clone --branch v0.0.4 https://gerrit.o-ran-sc.org/r/com/log \
@@
-69,11
+61,13
@@
RUN cd /tmp \
&& make \
&& make install
&& make \
&& make install
-# RMR, version is pinned
-RUN cd /tmp \
- && git clone --branch 1.2.0 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
+# 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.1 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
&& cd rmr \
&& cd rmr \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make install
+ && mkdir .build; cd .build \
+ && echo "<<<installing rmr devel headers>>>" \
+ && cmake .. -DDEV_PKG=1; make install \
+ && echo "<<< installing rmr .so>>>" \
+ && cmake .. -DPACK_EXTERNALS=1; make install