Skip to content

Commit 3f03510

Browse files
authored
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]>
1 parent 8551174 commit 3f03510

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.github/workflows/test-build-deploy.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
lint:
1818
runs-on: ubuntu-20.04
1919
container:
20-
image: quay.io/cortexproject/build-image:master-779dcf4ba
20+
image: quay.io/cortexproject/build-image:master-582c03a76
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
4646
test:
4747
runs-on: ubuntu-20.04
4848
container:
49-
image: quay.io/cortexproject/build-image:master-779dcf4ba
49+
image: quay.io/cortexproject/build-image:master-582c03a76
5050
steps:
5151
- name: Checkout Repo
5252
uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
8989
build:
9090
runs-on: ubuntu-20.04
9191
container:
92-
image: quay.io/cortexproject/build-image:master-779dcf4ba
92+
image: quay.io/cortexproject/build-image:master-582c03a76
9393
steps:
9494
- name: Checkout Repo
9595
uses: actions/checkout@v2
@@ -223,14 +223,14 @@ jobs:
223223
run: |
224224
touch build-image/.uptodate
225225
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
226-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-779dcf4ba TTY='' configs-integration-test
226+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-582c03a76 TTY='' configs-integration-test
227227
228228
deploy_website:
229229
needs: [build, test]
230230
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
231231
runs-on: ubuntu-20.04
232232
container:
233-
image: quay.io/cortexproject/build-image:master-779dcf4ba
233+
image: quay.io/cortexproject/build-image:master-582c03a76
234234
steps:
235235
- name: Checkout Repo
236236
uses: actions/checkout@v2
@@ -272,7 +272,7 @@ jobs:
272272
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
273273
runs-on: ubuntu-20.04
274274
container:
275-
image: quay.io/cortexproject/build-image:master-779dcf4ba
275+
image: quay.io/cortexproject/build-image:master-582c03a76
276276
steps:
277277
- name: Checkout Repo
278278
uses: actions/checkout@v2

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## master / unreleased
44

5+
## 1.18.1 2024-10-14
6+
7+
* [BUGFIX] Backporting upgrade to go 1.22.7 to patch CVE-2024-34155, CVE-2024-34156, CVE-2024-34158 #6217 #6264
58

69
## 1.18.0 2024-09-03
710

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ build-image/$(UPTODATE): build-image/*
115115
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
116116
BUILD_IN_CONTAINER := true
117117
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
118-
LATEST_BUILD_IMAGE_TAG ?= master-779dcf4ba
118+
LATEST_BUILD_IMAGE_TAG ?= master-582c03a76
119119

120120
# TTY is parameterized to allow Google Cloud Builder to run builds,
121121
# as it currently disallows TTY devices. This value needs to be overridden

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.18.0
1+
1.18.1

0 commit comments

Comments
 (0)