[VOL-5583] upgrade go to 1.25.5 and golangci-lint version to 2.8.0
Signed-off-by: madhumatigouda <madhumati.gouda@radisys.com>
Change-Id: I85308c2b9d462a8911ff6f26c4ee949331bf47be
diff --git a/Makefile b/Makefile
index 0ebb48b..b5f7c04 100644
--- a/Makefile
+++ b/Makefile
@@ -19,15 +19,15 @@
VERSION ?= $(shell cat ./VERSION)
GO_JUNIT_REPORT_VERSION ?= "1.0.0"
GOCOVER_COBERTURA_VERSION ?= "v0.0.0-20180217150009-aaee18c8195c"
-GOLANG_VERSION ?= "1.25.3"
-GOLANGCI_LINT_VERSION ?= "2.5.0"
+GOLANG_VERSION ?= "1.25.5"
+GOLANGCI_LINT_VERSION ?= "2.8.0"
HADOLINT_VERSION ?= "2.12.0"
PROTOC_VERSION ?= "25.8"
PROTOC_SHA256SUM ?= "f7873a2b57811575c661faffa847e0e9b1bb06a1aea5021eccb05e8c04b260d5"
PROTOC_GEN_GO_VERSION ?= "1.36.11"
-PROTOC_GEN_GO_GRPC_VERSION ?= "1.6.0"
-PROTOC_GEN_GRPC_GATEWAY_VERSION ?= "1.14.3"
-PROTOC_GEN_CPP_VERSION ?= "1.31.1"
+PROTOC_GEN_GO_GRPC_VERSION ?= "1.6.1"
+PROTOC_GEN_GRPC_GATEWAY_VERSION ?= "2.22.0"
+PROTOC_GEN_CPP_VERSION ?= "1.78.1"
# Docker related
DOCKER_LABEL_VCS_DIRTY = false
diff --git a/VERSION b/VERSION
index e4604e3..be94e6f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.1
+3.2.2
diff --git a/docker/go-junit-report.Dockerfile b/docker/go-junit-report.Dockerfile
index 2601a72..f82792c 100644
--- a/docker/go-junit-report.Dockerfile
+++ b/docker/go-junit-report.Dockerfile
@@ -13,10 +13,10 @@
# limitations under the License.
ARG GOLANG_VERSION
-FROM golang:$GOLANG_VERSION-alpine as build
+FROM golang:$GOLANG_VERSION-alpine AS build
-RUN apk add --no-cache build-base=0.5-r3 git=2.49.1-r0 && \
-mkdir -m 777 /.cache /go/pkg
+RUN apk add --no-cache build-base=0.5-r3 git=2.52.0-r0 && \
+ mkdir -m 777 /.cache /go/pkg
# download & compile this specific version of go-junit-report
ARG GO_JUNIT_REPORT_VERSION
diff --git a/docker/golang.Dockerfile b/docker/golang.Dockerfile
index 9c55fec..31da814 100644
--- a/docker/golang.Dockerfile
+++ b/docker/golang.Dockerfile
@@ -15,7 +15,7 @@
ARG GOLANG_VERSION
FROM golang:$GOLANG_VERSION-alpine
-RUN apk add --no-cache git=2.49.1-r0 && \
+RUN apk add --no-cache git=2.52.0-r0 && \
mkdir -m 777 /.cache /go/pkg
ENV GO111MODULE=on CGO_ENABLED=0
diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index be4200f..71a794f 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -13,7 +13,7 @@
# limitations under the License.
ARG GOLANG_VERSION
-FROM golang:$GOLANG_VERSION-alpine as go-build
+FROM golang:$GOLANG_VERSION-alpine AS go-build
ARG PROTOC_VERSION
ARG PROTOC_SHA256SUM
@@ -21,14 +21,13 @@
ARG PROTOC_GEN_GO_GRPC_VERSION
ARG PROTOC_GEN_GRPC_GATEWAY_VERSION
-RUN apk add --no-cache libatomic=14.2.0-r6 musl=1.2.5-r10 git=2.49.1-r0 && \
+RUN apk add --no-cache libatomic=15.2.0-r2 musl=1.2.5-r21 git=2.52.0-r0 && \
mkdir -m 777 /.cache /go/pkg
# download & compile this specific version of protoc-gen-go
RUN GO111MODULE=on CGO_ENABLED=0 go install google.golang.org/protobuf/cmd/protoc-gen-go@v$PROTOC_GEN_GO_VERSION && \
GO111MODULE=on CGO_ENABLED=0 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v$PROTOC_GEN_GO_GRPC_VERSION && \
- GO111MODULE=on CGO_ENABLED=0 go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v$PROTOC_GEN_GRPC_GATEWAY_VERSION && \
- GO111MODULE=on CGO_ENABLED=0 go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v$PROTOC_GEN_GRPC_GATEWAY_VERSION && \
+ GO111MODULE=on CGO_ENABLED=0 go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v$PROTOC_GEN_GRPC_GATEWAY_VERSION && \
mkdir -p /tmp/protoc3 && \
wget -nv -O /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
[ "$(sha256sum /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip)" = "${PROTOC_SHA256SUM} /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip" ] && \
@@ -36,17 +35,17 @@
chmod -R a+rx /tmp/protoc3/
ARG GOLANG_VERSION
-FROM golang:$GOLANG_VERSION-alpine as cpp-build
+FROM golang:$GOLANG_VERSION-alpine AS cpp-build
ARG PROTOC_GEN_CPP_VERSION
# Install required packages
RUN apk add --no-cache \
build-base=0.5-r3 \
- git=2.49.1-r0 \
- cmake=3.31.7-r1 \
- linux-headers=6.14.2-r0 \
- perl=5.40.3-r0
+ git=2.52.0-r0 \
+ cmake=4.1.3-r0 \
+ linux-headers=6.16.12-r0 \
+ perl=5.42.0-r0
WORKDIR /src