From: ss412g <shuky.har-noy@intl.att.com>
Date: Sun, 22 Mar 2020 19:04:31 +0000 (+0200)
Subject: Move to Ubuntu 18 image
X-Git-Tag: R5_RC~121
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=999fe1fda28653c56d36029f9250351a4621345c;hp=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git

Move to Ubuntu 18 image

Change-Id: I8649b96a34ccc70005d9ac2daf4de1ff94ec1c8a
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
---

diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile
index 1352405..4d4bb0b 100755
--- a/E2Manager/Dockerfile
+++ b/E2Manager/Dockerfile
@@ -20,7 +20,7 @@
 #   platform project (RICP).
 #
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.04-nng as ubuntu
 
 WORKDIR /opt/E2Manager
 COPY . .
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y sudo
 RUN bash build-e2mgr-ubuntu.sh
 
 # Build deployable container
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y \
   net-tools \
diff --git a/E2Manager/build-e2mgr-ubuntu.sh b/E2Manager/build-e2mgr-ubuntu.sh
index e623ab8..0082585 100755
--- a/E2Manager/build-e2mgr-ubuntu.sh
+++ b/E2Manager/build-e2mgr-ubuntu.sh
@@ -51,6 +51,7 @@ export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
 go get -v github.com/ory/go-acc
 
 cd 3rdparty/asn1codec \
+    && make clobber \
     && make \
     && cd ../..