From 24f80f45e026915e780626b33e87588147d66df8 Mon Sep 17 00:00:00 2001
From: Anssi Mannila <anssi.mannila@nokia.com>
Date: Wed, 20 Oct 2021 11:30:15 +0300
Subject: [PATCH] Improved fix for outdated base image problem

Change-Id: Icf22a0e4ee6b7fe6fd8780a9afc00b49552b0d3b
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>
---
 Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09d9279..721f158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,9 +25,15 @@
 ###########################################################
 FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as submgrcore
 
-ARG GOVERSION=1.14
-
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/opt/go/${GOVERSION}/bin:/root/go/bin
+ARG g14="1.14.4"
+ARG GOVERSION="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/${GOVERSION} \
+     && rm -f go*.gz
+
+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:/root/go/bin
 
 # Update CA certificates
 RUN apt update && apt install --reinstall -y \
-- 
2.16.6