Merge pull request #385 from portworx/PB-7300

PB-7300: upgrading packages to fix critical cve
portworx · Jul 4, 2024 · e8d9eaa · e8d9eaa
2 parents 4a8c1c5 + 658185f
commit e8d9eaa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
   global:
     - GO111MODULE=on
 go:
-  - 1.21.6
+  - 1.21.11
 script:
   - |
     if [ -n "${TRAVIS_TAG}" ]; then

diff --git a/Dockerfile.unittest b/Dockerfile.unittest
@@ -7,8 +7,8 @@ RUN yum -y install gzip git tar wget curl bash vim make gpg bzip2
 
 RUN git config --global --add safe.directory /go/src/github.com/portworx/kdmp
 
-RUN curl https://dl.google.com/go/go1.21.6.linux-amd64.tar.gz -o go1.21.6.linux-amd64.tar.gz
-RUN tar -xf go1.21.6.linux-amd64.tar.gz && mv go /usr/local/
+RUN curl https://dl.google.com/go/go1.21.11.linux-amd64.tar.gz -o go1.21.11.linux-amd64.tar.gz
+RUN tar -xf go1.21.11.linux-amd64.tar.gz && mv go /usr/local/
 ENV GOROOT /usr/local/go
 ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
 

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ BASE_DIR    := $(shell git rev-parse --show-toplevel)
 GIT_SHA     := $(shell git rev-parse --short HEAD)
 BIN         := $(BASE_DIR)/bin
 
-DOCK_BUILD_CNT  := golang:1.21.6
+DOCK_BUILD_CNT  := golang:1.21.11
 
 DOCKER_IMAGE_REPO?=portworx
 DOCKER_IMAGE_NAME?=kdmp
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ env: @@
       global:
         - GO111MODULE=on
     go:
-      - 1.21.6
+      - 1.21.11
     script:
       - |
         if [ -n "${TRAVIS_TAG}" ]; then
@@ Expand Down @@