X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker%2Fbldr-ubuntu18-c-go%2FDockerfile;h=47e77feaa7515f76cab208af6211041759910666;hb=refs%2Fchanges%2F90%2F2190%2F1;hp=c8421c9528674bc6935213b67582b464ee533776;hpb=66a126044c9b105e41d8cf359823e66e5c9a43e3;p=ci-management.git

diff --git a/docker/bldr-ubuntu18-c-go/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile
index c8421c95..47e77fea 100644
--- a/docker/bldr-ubuntu18-c-go/Dockerfile
+++ b/docker/bldr-ubuntu18-c-go/Dockerfile
@@ -15,13 +15,6 @@
 # limitations under the License.
 
 # Builder image with superset of CI tools for RIC components
-# Uses Ubuntu 18.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 nexus3.o-ran-sc.org:10001/ubuntu:18.04
 
@@ -58,14 +51,25 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.
 RUN wget -nv https://dl.google.com/go/go1.12.linux-amd64.tar.gz \
     && tar -xf go1.12.linux-amd64.tar.gz \
     && mv go /usr/local
+ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin
+RUN go get -u github.com/ory/go-acc \
+    && mv ~/go/bin/go-acc /usr/local/go/bin
+
+RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip \
+    && unzip sonar-scanner-cli-3.2.0.1227-linux.zip \
+    && mv sonar-scanner-3.2.0.1227-linux /usr/local/
 
 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
 
-RUN git clone --branch v1.1.1 https://github.com/nanomsg/nng.git \
+# 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 .. \