X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=bldr-imgs%2Fbldr-ubuntu18-c-go%2FDockerfile;h=c7be3e4a4456a74ddfa5e4e222b77d9fbdc03fec;hb=HEAD;hp=6742e97e9bb0e8a021b5674098d4a10d7e7f19c8;hpb=aaec3d13d810171cd21e798c21523d18f564702b;p=it%2Fdev.git

diff --git a/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile b/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile
index 6742e97..c7be3e4 100644
--- a/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile
+++ b/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile
@@ -19,14 +19,17 @@
 FROM nexus3.o-ran-sc.org:10001/ubuntu:18.04
 
 RUN apt-get update && apt-get install -y \
+    alien \
     autoconf \
     autoconf-archive \
     automake \
     autotools-dev \
     build-essential \
+    cmake \
     g++  \
     gcc \
     git \
+    ksh \
     libbz2-dev \
     libicu-dev \
     libsctp-dev \
@@ -54,13 +57,13 @@ RUN wget -nv https://dl.google.com/go/go${g12}.linux-amd64.tar.gz \
     && mv go /opt/go/1.12 \
     && rm -f go*.gz
 
-ARG g13="1.13.9"
+ARG g13="1.13.12"
 RUN wget -nv https://dl.google.com/go/go${g13}.linux-amd64.tar.gz \
     && tar -xf go${g13}.linux-amd64.tar.gz \
     && mv go /opt/go/1.13 \
     && rm -f go*.gz
 
-ARG g14="1.14.1"
+ARG g14="1.14.4"
 RUN wget -nv https://dl.google.com/go/go${g14}.linux-amd64.tar.gz \
     && tar -xf go${g14}.linux-amd64.tar.gz \
     && mv go /opt/go/1.14 \
@@ -84,13 +87,6 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${cv}/cmake-${c
     && ./cmake-${cv}-Linux-x86_64.sh --prefix=/usr/local --skip-license \
     && rm -f cmake*.sh
 
-# install a recent version of ninja-build, ubuntu repo version is old
-RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip \
-    && unzip ninja-linux.zip \
-    && chmod +x ninja \
-    && mv ninja /usr/local/bin \
-    && rm -f ninja*.zip
-
 # sonar-scanner is not available in ubuntu repo
 ARG sv="4.2.0.1873"
 RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${sv}-linux.zip \
@@ -102,20 +98,6 @@ RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/son
 RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.23.6 \
     && rm -f install.sh
 
-# NNG repo is not frequently tagged so it's pinned to a commit hash.
-# This commit provides fix to the proxy-reconnect
-# bug that we identified:  https://github.com/nanomsg/nng/issues/970
-RUN git clone https://github.com/nanomsg/nng.git \
-    && cd nng \
-    && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
-    && mkdir build \
-    && cd build \
-    && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
-    && ninja \
-    && ninja install \
-    && cd ../.. \
-    && rm -rf nng
-
 # install a recent version of boost, ubuntu repo version is old
 ARG bv="1_69_0"
 RUN wget -nv https://dl.bintray.com/boostorg/release/1.69.0/source/boost_${bv}.zip \