[VOL-5374] Upgrade tools with go version 1.23.1
Change-Id: I12caf4f747f934be1553b6eb0e95b590a111e922
Signed-off-by: abhay <abhayk@radisys.com>
diff --git a/Makefile b/Makefile
index 64f6422..3f0663e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,12 @@
## Variables
VERSION ?= $(shell cat ./VERSION)
-GO_JUNIT_REPORT_VERSION ?= "0.9.1"
+GO_JUNIT_REPORT_VERSION ?= "1.0.0"
GOCOVER_COBERTURA_VERSION ?= "v0.0.0-20180217150009-aaee18c8195c"
-GOLANG_VERSION ?= "1.16.3"
-GOLANGCI_LINT_VERSION ?= "1.44.2"
-HADOLINT_VERSION ?= "1.17.5"
+GOLANG_VERSION ?= "1.23.1"
+GOLANG_VERSION_FOR_PROTOC ?= "1.16.3"
+GOLANGCI_LINT_VERSION ?= "1.61.0"
+HADOLINT_VERSION ?= "2.12.0"
PROTOC_VERSION ?= "3.7.0"
PROTOC_SHA256SUM ?= "a1b8ed22d6dc53c5b8680a6f1760a305b33ef471bece482e92728f00ba2a2969"
PROTOC_GEN_GO_VERSION ?= "1.3.2"
@@ -116,7 +117,7 @@
protoc:
${DOCKER} build ${DOCKER_BUILD_ARGS} \
- --build-arg GOLANG_VERSION=${GOLANG_VERSION} \
+ --build-arg GOLANG_VERSION=${GOLANG_VERSION_FOR_PROTOC} \
--build-arg PROTOC_VERSION=${PROTOC_VERSION} \
--build-arg PROTOC_SHA256SUM=${PROTOC_SHA256SUM} \
--build-arg PROTOC_GEN_GO_VERSION=${PROTOC_GEN_GO_VERSION} \
diff --git a/VERSION b/VERSION
index aedc15b..fd2a018 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.3
+3.1.0
diff --git a/docker/go-junit-report.Dockerfile b/docker/go-junit-report.Dockerfile
index d2a5f3a..461a3b0 100644
--- a/docker/go-junit-report.Dockerfile
+++ b/docker/go-junit-report.Dockerfile
@@ -15,13 +15,14 @@
ARG GOLANG_VERSION
FROM golang:$GOLANG_VERSION-alpine as build
-RUN apk add --no-cache build-base=0.5-r2
+RUN apk add --no-cache build-base=0.5-r3 git=2.45.2-r0 && \
+mkdir -m 777 /.cache /go/pkg
# download & compile this specific version of go-junit-report
ARG GO_JUNIT_REPORT_VERSION
-RUN GO111MODULE=on CGO_ENABLED=0 go get -u -ldflags "-linkmode external -extldflags -static" github.com/jstemmer/go-junit-report@v$GO_JUNIT_REPORT_VERSION
+RUN GO111MODULE=on CGO_ENABLED=0 go install -ldflags "-extldflags -static" github.com/jstemmer/go-junit-report@v$GO_JUNIT_REPORT_VERSION
-FROM busybox:1.31.1
+FROM busybox:1.36.1
# copy go-junit-report
COPY --from=build /go/bin/* /usr/local/bin/
diff --git a/docker/gocover-cobertura.Dockerfile b/docker/gocover-cobertura.Dockerfile
index 62e1d14..7c2bc73 100644
--- a/docker/gocover-cobertura.Dockerfile
+++ b/docker/gocover-cobertura.Dockerfile
@@ -14,11 +14,11 @@
ARG GOLANG_VERSION
FROM golang:$GOLANG_VERSION-alpine as build
-RUN apk add --no-cache build-base=0.5-r2
+RUN apk add --no-cache build-base=0.5-r3
# download & compile this specific version of gocover-cobertura
ARG GOCOVER_COBERTURA_VERSION
-RUN GO111MODULE=on CGO_ENABLED=0 go get -u -ldflags "-linkmode external -extldflags -static" github.com/t-yuki/gocover-cobertura@$GOCOVER_COBERTURA_VERSION
+RUN GO111MODULE=on CGO_ENABLED=0 go install -ldflags "-extldflags -static" github.com/t-yuki/gocover-cobertura@$GOCOVER_COBERTURA_VERSION
FROM golang:$GOLANG_VERSION-alpine
diff --git a/docker/golang.Dockerfile b/docker/golang.Dockerfile
index 519d500..0862663 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.30.2-r0 && \
+RUN apk add --no-cache git=2.45.2-r0 && \
mkdir -m 777 /.cache /go/pkg
ENV GO111MODULE=on CGO_ENABLED=0
diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index c60c02d..b7a2abc 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -20,16 +20,15 @@
ARG PROTOC_GEN_GO_VERSION
ARG PROTOC_GEN_GRPC_GATEWAY_VERSION
-RUN apk add --no-cache libatomic=10.2.1_pre1-r3 musl=1.2.2-r0
+RUN apk add --no-cache libatomic=10.2.1_pre1-r3 musl=1.2.2-r0 git=2.30.6-r0 && \
+ mkdir -m 777 /.cache /go/pkg
# download & compile this specific version of protoc-gen-go
-RUN GO111MODULE=on CGO_ENABLED=0 go get -a -u \
- github.com/golang/protobuf/protoc-gen-go@v$PROTOC_GEN_GO_VERSION \
- github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v$PROTOC_GEN_GRPC_GATEWAY_VERSION \
- github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v$PROTOC_GEN_GRPC_GATEWAY_VERSION
-
-RUN mkdir -p /tmp/protoc3 && \
- wget -O /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
+RUN GO111MODULE=on CGO_ENABLED=0 go install github.com/golang/protobuf/protoc-gen-go@v$PROTOC_GEN_GO_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 && \
+ mkdir -p /tmp/protoc3 && \
+ wget -nv -O /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/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" ] && \
unzip /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /tmp/protoc3 && \
chmod -R a+rx /tmp/protoc3/
@@ -41,8 +40,8 @@
# Install required packages
RUN apk add --no-cache \
- build-base=0.5-r2 \
- git=2.30.2-r0 \
+ build-base=0.5-r3 \
+ git=2.30.6-r0 \
cmake=3.18.4-r1 \
linux-headers=5.7.8-r0 \
perl=5.32.0-r0
@@ -50,11 +49,16 @@
WORKDIR /src
# Clone grpc and submodules
-RUN git clone --recurse-submodules -b v${PROTOC_GEN_CPP_VERSION} \
- --depth=1 --shallow-submodules https://github.com/grpc/grpc
+# RUN git clone --recurse-submodules -b v${PROTOC_GEN_CPP_VERSION} --depth=1 --shallow-submodules https://github.com/grpc/grpc
+# WORKDIR /src/grpc
+# Clone the main repository without submodules
+RUN git clone -b v${PROTOC_GEN_CPP_VERSION} --depth=1 https://github.com/grpc/grpc /src/grpc
+WORKDIR /src/grpc
+RUN git config --file .gitmodules submodule.third_party/re2.url https://github.com/google/re2.git && \
+ git submodule sync && \
+ git submodule update --init --recursive --depth=1 && \
+ mkdir -p /src/grpc/cmake/build
-# Create and configure make environment
-RUN mkdir -p /src/grpc/cmake/build
WORKDIR /src/grpc/cmake/build
RUN cmake \
-DgRPC_INSTALL=ON \
@@ -66,10 +70,8 @@
-DgRPC_RE2_PROVIDER=module \
-DgRPC_SSL_PROVIDER=module \
-DgRPC_ZLIB_PROVIDER=module \
- ../..
-
-# Build the cpp plugin
-RUN make grpc_cpp_plugin
+ ../.. && \
+ make grpc_cpp_plugin
FROM busybox:1.31.1-glibc
diff --git a/docker/python.Dockerfile b/docker/python.Dockerfile
index acec795..c7f5ece 100644
--- a/docker/python.Dockerfile
+++ b/docker/python.Dockerfile
@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM python:3.8.5-alpine
+FROM python:3.12.7-alpine
-RUN pip install -I tox==3.19.0 && pip install -I bandit==1.6.2
+RUN pip install --no-cache-dir --upgrade pip==24.2 && pip install --no-cache-dir -I tox==4.20.0 && pip --no-cache-dir install -I bandit==1.7.10
WORKDIR /app