X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fbldr-ubuntu-c-go-nng%2FDockerfile;h=6bee3407be8aaaece4223bc7b97376590c512e2b;hb=b09f682b3d2b2990b33daf2fe2d3462b4b18678d;hp=11029aa29a85a6bfdbf757bdb4ae21220236d90c;hpb=f55f21ea05bf4aa098902171e730f832a9867893;p=ci-management.git

diff --git a/docker/bldr-ubuntu-c-go-nng/Dockerfile b/docker/bldr-ubuntu-c-go-nng/Dockerfile
old mode 100755
new mode 100644
index 11029aa2..6bee3407
--- a/docker/bldr-ubuntu-c-go-nng/Dockerfile
+++ b/docker/bldr-ubuntu-c-go-nng/Dockerfile
@@ -14,23 +14,40 @@
 # 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 apt packages including gcc and g++ 5.4
+# 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 v1.1.1 from source distro
+# Boost 1.69 from source distro
 
-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 \
-    autoconf autoconf-archive libtool automake pkg-config
+    autoconf \
+    autoconf-archive \
+    automake \
+    autotools-dev \
+    build-essential \
+    g++  \
+    gcc \
+    git \
+    libbz2-dev \
+    libicu-dev \
+    libsctp-dev \
+    libtool \
+    lksctp-tools \
+    make \
+    python-dev \
+    pkg-config \
+    software-properties-common \
+    wget \
+    zlib1g \
+    zlib1g-dev \
+    zlibc \
+    zip
 
 WORKDIR /tmp
 
@@ -49,8 +66,18 @@ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja
 
 RUN git clone https://github.com/nanomsg/nng.git \
     && cd nng \
+    && git checkout v1.1.1 \
     && mkdir build \
     && cd build \
     && 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