From: Abdulwahid Date: Tue, 11 Nov 2025 11:58:48 +0000 (+0000) Subject: RIC-1074: Update base OS to ubuntu22.04 and golang to 1.22 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b1b7849160e90bc33ecbc9bbd15ac43dcc8da192;p=ric-plt%2Fappmgr.git RIC-1074: Update base OS to ubuntu22.04 and golang to 1.22 Change-Id: I33333c1702ec5fffb4b6536a7a54de0798e6b977 Signed-off-by: Abdulwahid --- diff --git a/Dockerfile b/Dockerfile index 3a0f870..73fa8e3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ #----------------------------------------------------------- -FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu20-c-go:1.0.0 AS appmgr-build +FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu22-c-go:1.0.0 AS appmgr-build RUN apt-get update -y && apt-get install -y jq @@ -25,7 +25,15 @@ RUN apt update && apt install --reinstall -y \ && \ update-ca-certificates -ENV PATH="/usr/local/go/bin:${PATH}" +ARG GOVERSION="1.22.5" +RUN wget -nv https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz \ + && tar -xf go${GOVERSION}.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 # Install helm #RUN wget -nv https://storage.googleapis.com/kubernetes-helm/helm-${HELMVERSION}-linux-amd64.tar.gz \ @@ -73,7 +81,7 @@ RUN gofmt -l $(find cmd/ pkg/ -name '*.go' -not -name '*_test.go') CMD ["/bin/bash"] #---------------------------------------------------------- -FROM ubuntu:20.04 as appmgr +FROM ubuntu:22.04 as appmgr RUN apt-get update -y \ && apt-get install --reinstall -y sudo openssl ca-certificates ca-cacert \ diff --git a/go.mod b/go.mod index ad7e2f7..995d59e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gerrit.o-ran-sc.org/r/ric-plt/appmgr -go 1.18 +go 1.22 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.8.0