From 419a8dca3369840c720e3d56e92f313c59c54817 Mon Sep 17 00:00:00 2001 From: gatici Date: Tue, 10 Oct 2023 17:55:49 +0300 Subject: [PATCH] Bumps go version to 1.21 (latest stable) Signed-off-by: gatici --- Dockerfile | 9 ++------- go.mod | 37 +++++++++++++++++++++++++++++++++---- go.sum | 1 - 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5977cd..ff0c0e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,13 @@ # SPDX-License-Identifier: Apache-2.0 # -FROM golang:1.16.0-stretch AS builder +FROM golang:1.21.3-bookworm AS builder LABEL maintainer="ONF " -#RUN apt remove cmdtest yarn RUN apt-get update && apt-get -y install apt-transport-https ca-certificates -RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg > pubkey.gpg -RUN apt-key add pubkey.gpg -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - -RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN apt-get update -RUN apt-get -y install gcc cmake autoconf libtool pkg-config libmnl-dev libyaml-dev nodejs yarn +RUN apt-get -y install gcc cmake autoconf libtool pkg-config libmnl-dev libyaml-dev RUN apt-get clean diff --git a/go.mod b/go.mod index 3ea8758..8400d98 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,10 @@ module github.com/omec-project/udm -go 1.16 +go 1.21 require ( github.com/antihax/optional v1.0.0 github.com/antonfisher/nested-logrus-formatter v1.3.1 - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/gin-gonic/gin v1.7.0 github.com/google/uuid v1.1.2 github.com/omec-project/UeauCommon v1.1.0 @@ -18,9 +17,39 @@ require ( github.com/omec-project/openapi v1.1.0 github.com/omec-project/path_util v1.1.0 github.com/omec-project/util_3gpp v1.1.1 - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 github.com/urfave/cli v1.22.5 - google.golang.org/grpc v1.48.0 // indirect gopkg.in/yaml.v2 v2.4.0 ) + +require ( + github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.4.1 // indirect + github.com/golang-jwt/jwt v3.2.1+incompatible // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/leodido/go-urn v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/omec-project/logger_conf v1.1.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/ugorji/go/codec v1.2.1 // indirect + golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect + golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect + golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 // indirect + golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect + golang.org/x/text v0.3.6 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect + google.golang.org/grpc v1.48.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/h2non/gock.v1 v1.1.2 // indirect +) diff --git a/go.sum b/go.sum index 1d596ac..8ab16d1 100644 --- a/go.sum +++ b/go.sum @@ -219,7 +219,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go v1.2.1 h1:dz+JxTe7GZQdErTo7SREc1jQj/hFP1k7jyIAwODoW+k= github.com/ugorji/go v1.2.1/go.mod h1:cSVypSfTLm2o9fKxXvQgn3rMmkPXovcWor6Qn5tbFmI= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.1 h1:/TRfW3XKkvWvmAYyCUaQlhoCDGjcvNR8xVVA/l5p/jQ=