Backport go upgrade to patch CVEs (#6264)

* Backport go upgrade to patch CVEs Signed-off-by: Friedrich Gonzalez <[email protected]> * Update VERSION file Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
cortexproject · Oct 15, 2024 · 3f03510 · 3f03510
1 parent 8551174
commit 3f03510
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -17,7 +17,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-779dcf4ba
+      image: quay.io/cortexproject/build-image:master-582c03a76
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-779dcf4ba
+      image: quay.io/cortexproject/build-image:master-582c03a76
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-779dcf4ba
+      image: quay.io/cortexproject/build-image:master-582c03a76
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -223,14 +223,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-779dcf4ba TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-582c03a76 TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-779dcf4ba
+      image: quay.io/cortexproject/build-image:master-582c03a76
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -272,7 +272,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-779dcf4ba
+      image: quay.io/cortexproject/build-image:master-582c03a76
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## master / unreleased
 
+## 1.18.1 2024-10-14
+
+* [BUGFIX] Backporting upgrade to go 1.22.7 to patch CVE-2024-34155, CVE-2024-34156, CVE-2024-34158 #6217 #6264
 
 ## 1.18.0 2024-09-03
 

diff --git a/Makefile b/Makefile
@@ -115,7 +115,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= master-779dcf4ba
+LATEST_BUILD_IMAGE_TAG ?= master-582c03a76
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.18.0
+1.18.1