Add boost ver 1.69 to builder image

Drop install of boost via apt package

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: Id05887bb16ac389a103a2a51b0a1add6363a7884

diff --git a/docker/bldr-ubuntu-c-go-nng/Dockerfile b/docker/bldr-ubuntu-c-go-nng/Dockerfile
old mode 100755 (executable)
new mode 100644 (file)
index 11029aa..90e7d01
--- a/docker/bldr-ubuntu-c-go-nng/Dockerfile
+++ b/docker/bldr-ubuntu-c-go-nng/Dockerfile
@@ -14,22 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Builder image with CI tools for most RIC components
-# Based on Ubuntu 16.04
-# Adds standard packages gcc and g++ 5.4, sctp boost etc.
-# Adds Golang 1.12 from binary distro to /usr/local/go
-# Adds Cmake 3.14.5 from binary distro to /usr/local/bin
-# Adds Ninja 1.9 from binary distro to /usr/local/bin
-# Adds Nanomsg Next Gen libs by cloning and building
+# Builder image with superset of CI tools for RIC components
+# Uses Ubuntu 16.04 base then adds:
+# Standard packages gcc and g++ 5.4, sctp etc.
+# Cmake 3.14.5 from binary distro to /usr/local/bin
+# Golang 1.12 from binary distro to /usr/local/go
+# Ninja 1.9 from binary distro to /usr/local/bin
+# Nanomsg Next Gen libs by cloning and building
+# Boost 1.69 from source distro by building
 
-FROM ubuntu:16.04
+FROM nexus3.o-ran-sc.org:10001/ubuntu:16.04
 
 RUN apt-get update && apt-get install -y \
     build-essential software-properties-common \
     git zip wget make gcc g++  \
     libsctp-dev lksctp-tools \
     zlibc zlib1g zlib1g-dev \
-    python-dev autotools-dev libicu-dev libbz2-dev libboost-all-dev \
+    python-dev autotools-dev libicu-dev libbz2-dev \
     autoconf autoconf-archive libtool automake pkg-config
 
 WORKDIR /tmp
@@ -54,3 +55,12 @@ RUN git clone https://github.com/nanomsg/nng.git \
     && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
     && ninja \
     && ninja install
+
+RUN wget -nv https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.zip \
+    && unzip -q boost_1_69_0.zip \
+    && cd boost_1_69_0 \
+    && ./bootstrap.sh --prefix=/usr/ \
+    && ./b2 \
+    && ./b2 install \
+    && cd ../ \
+    && rm -rf boost_1_69_0.zip boost_1_69_0

diff --git a/docker/bldr-ubuntu-c-go-nng/container-tag.yaml b/docker/bldr-ubuntu-c-go-nng/container-tag.yaml
index 1008f4d..e10aaa8 100644 (file)
--- a/docker/bldr-ubuntu-c-go-nng/container-tag.yaml
+++ b/docker/bldr-ubuntu-c-go-nng/container-tag.yaml
@@ -1,4 +1,4 @@
 # Not feasible to show all the software versions
 # here so just use a counter plus the base image
 ---
-tag: 1-u16.04
+tag: 2-u16.04