From: Juha Hyttinen <juha.hyttinen@nokia.com>
Date: Tue, 9 Nov 2021 10:06:44 +0000 (+0200)
Subject: Use ubuntu20.04 image in testing as it's default go version is 1.16
X-Git-Tag: v0.9.8~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=bb554448a2eb866606db0fea7a1d689005569ff4;p=ric-plt%2Fxapp-frame.git

Use ubuntu20.04 image in testing as it's default go version is 1.16

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

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 69badcf..71aaed3 100755
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,13 +17,8 @@
 #
 #----------------------------------------------------------
 
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as xapp-base
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.0.0 as xapp-base
 
-ARG g16="1.16.4"
-RUN wget -nv https://dl.google.com/go/go${g16}.linux-amd64.tar.gz \
-    && tar -xf go${g16}.linux-amd64.tar.gz \
-    && mv go /opt/go/1.16 \
-    && rm -f go*.gz
 
 RUN apt-get update -y \
     &&apt-get install -y \
@@ -39,9 +34,6 @@ RUN apt-get update -y \
     curl \
     tree
 
-ARG GOVERSION=1.16
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/go/${GOVERSION}/bin
-
 RUN curl -s https://packagecloud.io/install/repositories/o-ran-sc/master/script.deb.sh | bash
 
 # RMR
@@ -83,7 +75,6 @@ RUN make -C /ws go-build
 # Test fmt
 RUN make -C /ws go-test-fmt
 
-# Test Requires dbaas
 #RUN sed -r  "s/^(::1.*)/#\1/" /etc/hosts  > /etc/hosts.new \
 #    && cat /etc/hosts.new > /etc/hosts \
 #    && cat /etc/hosts  \