From b09f682b3d2b2990b33daf2fe2d3462b4b18678d Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 20 Jun 2019 09:14:28 -0400 Subject: [PATCH] Reorganize package list for ease of scanning No functional change Signed-off-by: Lott, Christopher (cl778h) Change-Id: I63d48a549723867f7cf161849dc998e4798a6dcc --- docker/bldr-ubuntu-c-go-nng/Dockerfile | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/docker/bldr-ubuntu-c-go-nng/Dockerfile b/docker/bldr-ubuntu-c-go-nng/Dockerfile index 6809e090..6bee3407 100644 --- a/docker/bldr-ubuntu-c-go-nng/Dockerfile +++ b/docker/bldr-ubuntu-c-go-nng/Dockerfile @@ -16,22 +16,38 @@ # 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. +# 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 libs by cloning and building -# Boost 1.69 from source distro by building +# Nanomsg Next Gen v1.1.1 from source distro +# Boost 1.69 from source distro 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 \ - 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 -- 2.16.6