[VOL-5475] upgrade go to 1.24.5 and golangci-lint version to 2.2.2
Change-Id: Ia44b2054ee6840ee3cb0aa55cf9f8a5fd41718dd
Signed-off-by: mgouda <madhumati.gouda@radisys.com>
diff --git a/Makefile b/Makefile
index 640b0f1..b55e271 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,9 @@
VERSION ?= $(shell cat ./VERSION)
GO_JUNIT_REPORT_VERSION ?= "1.0.0"
GOCOVER_COBERTURA_VERSION ?= "v0.0.0-20180217150009-aaee18c8195c"
-GOLANG_VERSION ?= "1.24.0"
+GOLANG_VERSION ?= "1.24.5"
GOLANG_VERSION_FOR_PROTOC ?= "1.16.3"
-GOLANGCI_LINT_VERSION ?= "2.0.2"
+GOLANGCI_LINT_VERSION ?= "2.2.2"
HADOLINT_VERSION ?= "2.12.0"
PROTOC_VERSION ?= "3.7.0"
PROTOC_SHA256SUM ?= "a1b8ed22d6dc53c5b8680a6f1760a305b33ef471bece482e92728f00ba2a2969"
@@ -58,7 +58,7 @@
--build-arg org_opencord_vcs_dirty="${DOCKER_LABEL_VCS_DIRTY}"
## runnable tool containers
-HADOLINT = ${DOCKER} run --rm --user $$(id -u):$$(id -g) -v $$PWD:/app ${IMAGENAME}:${VERSION}-hadolint hadolint
+HADOLINT = ${DOCKER} run --rm --user $$(id -u):$$(id -g) -v $$PWD:/app ${IMAGENAME}:${DOCKER_TAG}-hadolint hadolint
lint: docker-lint
diff --git a/VERSION b/VERSION
index ef538c2..ff365e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.2
+3.1.3
diff --git a/docker/go-junit-report.Dockerfile b/docker/go-junit-report.Dockerfile
index 21543ce..2601a72 100644
--- a/docker/go-junit-report.Dockerfile
+++ b/docker/go-junit-report.Dockerfile
@@ -15,7 +15,7 @@
ARG GOLANG_VERSION
FROM golang:$GOLANG_VERSION-alpine as build
-RUN apk add --no-cache build-base=0.5-r3 git=2.47.2-r0 && \
+RUN apk add --no-cache build-base=0.5-r3 git=2.49.1-r0 && \
mkdir -m 777 /.cache /go/pkg
# download & compile this specific version of go-junit-report
diff --git a/docker/golang.Dockerfile b/docker/golang.Dockerfile
index d27cee0..9c55fec 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.47.2-r0 && \
+RUN apk add --no-cache git=2.49.1-r0 && \
mkdir -m 777 /.cache /go/pkg
ENV GO111MODULE=on CGO_ENABLED=0