From: Juha Hyttinen <juha.hyttinen@nokia.com>
Date: Fri, 19 Aug 2022 11:35:36 +0000 (+0300)
Subject: go 1.18 as default version
X-Git-Tag: 1.1.0^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F8913%2F4;p=it%2Fdev.git

go 1.18 as default version

Issue-Id: RIC-937

Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
Change-Id: I42cf862ebb624d76aef32f42d769f886a7382c30
---

diff --git a/bldr-imgs/bldr-ubuntu20-c-go/Dockerfile b/bldr-imgs/bldr-ubuntu20-c-go/Dockerfile
index 8ddeb23..a832398 100644
--- a/bldr-imgs/bldr-ubuntu20-c-go/Dockerfile
+++ b/bldr-imgs/bldr-ubuntu20-c-go/Dockerfile
@@ -61,16 +61,22 @@ RUN wget -nv https://dl.google.com/go/go${g16}.linux-amd64.tar.gz \
     && mv go /opt/go/1.16 \
     && rm -f go*.gz
 
-ARG g17="1.17.1"
+ARG g17="1.17.10"
 RUN wget -nv https://dl.google.com/go/go${g17}.linux-amd64.tar.gz \
     && tar -xf go${g17}.linux-amd64.tar.gz \
     && mv go /opt/go/1.17 \
     && rm -f go*.gz
 
-# Default path has go version 1.16.x
+ARG g18="1.18.5"
+RUN wget -nv https://dl.google.com/go/go${g18}.linux-amd64.tar.gz \
+    && tar -xf go${g18}.linux-amd64.tar.gz \
+    && mv go /opt/go/1.18 \
+    && rm -f go*.gz
+
 # Use /opt/go/1.16/bin for version 1.16.x
 # Use /opt/go/1.17/bin for version 1.17.x
-ARG GOVERSION=1.16
+# Use /opt/go/1.18/bin for version 1.18.x (default)
+ARG GOVERSION=1.18
 ENV GOPATH=/root/go
 ENV DEFAULTPATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV PATH=$DEFAULTPATH:/usr/local/go/bin:/opt/go/${GOVERSION}/bin:$GOPATH/bin
@@ -78,9 +84,10 @@ ENV PATH=$DEFAULTPATH:/usr/local/go/bin:/opt/go/${GOVERSION}/bin:$GOPATH/bin
 # This installs go-acc to GOPATH
 RUN go version; \
     export GOBIN=/usr/local/bin/; export GO111MODULE=on;\
-    go get -v github.com/ory/go-acc \
+    go install github.com/ory/go-acc@master \
     && go-acc --help
 
+
 # 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 \
diff --git a/bldr-imgs/bldr-ubuntu20-c-go/container-tag.yaml b/bldr-imgs/bldr-ubuntu20-c-go/container-tag.yaml
index 41f4a30..40ff32a 100644
--- a/bldr-imgs/bldr-ubuntu20-c-go/container-tag.yaml
+++ b/bldr-imgs/bldr-ubuntu20-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: 1.0.0
+tag: 1.1.0