Merge "Adjust alarm-go CI job config esp sonar"

diff --git a/docker/bldr-alpine3-go/Dockerfile b/docker/bldr-alpine3-go/Dockerfile
index a1e31f0..15cf91d 100644 (file)
--- a/docker/bldr-alpine3-go/Dockerfile
+++ b/docker/bldr-alpine3-go/Dockerfile
@@ -16,14 +16,14 @@
 # ==================================================================================
 
 # Has:
-# golang 1.13.7
+# golang 1.13.8
 # alpine 3.11
 # rmr 1.13.1
 # Installing this version of rmr also pulls in nng
 
 # install a well known working rmr
-FROM golang:1.13.7-alpine3.11
-RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git
+FROM golang:1.13.8-alpine3.11
+RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git sudo
 RUN git clone --branch 1.13.1 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
     && cd rmr \
     && mkdir .build; cd .build \

diff --git a/docker/bldr-alpine3-go/container-tag.yaml b/docker/bldr-alpine3-go/container-tag.yaml
index ef8d069..4f62d1e 100644 (file)
--- a/docker/bldr-alpine3-go/container-tag.yaml
+++ b/docker/bldr-alpine3-go/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1-rmr1.13.1
+tag: 2-rmr1.13.1

diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile
index 499e167..9fe6f98 100644 (file)
--- a/docker/bldr-alpine3/Dockerfile
+++ b/docker/bldr-alpine3/Dockerfile
@@ -40,6 +40,7 @@ RUN apk update && apk add \
   ninja \
   pkgconfig \
   python-dev \
+  sudo \
   git \
   go
 

diff --git a/docker/bldr-ubuntu18-c-go/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile
index 3d21db2..d9f1fe5 100644 (file)
--- a/docker/bldr-ubuntu18-c-go/Dockerfile
+++ b/docker/bldr-ubuntu18-c-go/Dockerfile
@@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y \
     python-dev \
     pkg-config \
     software-properties-common \
+    sudo \
     wget \
     zlib1g \
     zlib1g-dev \
@@ -47,21 +48,28 @@ WORKDIR /tmp
 # Install go versions in /opt
 RUN mkdir -p /opt/go
 
-ARG g12="1.12.16"
+ARG g12="1.12.17"
 RUN wget -nv https://dl.google.com/go/go${g12}.linux-amd64.tar.gz \
     && tar -xf go${g12}.linux-amd64.tar.gz \
     && mv go /opt/go/1.12 \
     && rm -f go*.gz
 
-ARG g13="1.13.7"
+ARG g13="1.13.8"
 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"
+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 \
+    && rm -f go*.gz
+
 ENV GOPATH=/root/go
 # Default path has go version 1.12.x
 # Use /opt/go/1.13/bin for version 1.13.x
+# Use /opt/go/1.14/bin for version 1.14.x
 ENV PATH=$PATH:/opt/go/1.12/bin:$GOPATH/bin
 
 # This installs go-acc to GOPATH

diff --git a/docker/bldr-ubuntu18-c-go/container-tag.yaml b/docker/bldr-ubuntu18-c-go/container-tag.yaml
index 4706dbf..0bffd9f 100644 (file)
--- a/docker/bldr-ubuntu18-c-go/container-tag.yaml
+++ b/docker/bldr-ubuntu18-c-go/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: 4-u18.04-nng
+tag: 5-u18.04-nng