Skip to content

Commit 8f0ec45

Browse files
authored
[Release 1.11] Update to Go v1.16.15 (#4663)
* Update to Go v1.16.15 To address CVE-2022-24921 "stack exhaustion via a deeply nested expression". Signed-off-by: Bryan Boreham <[email protected]>
1 parent 43c646b commit 8f0ec45

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-20.04
1212
container:
13-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
13+
image: quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212
1414
steps:
1515
- name: Checkout Repo
1616
uses: actions/checkout@v2
@@ -34,7 +34,7 @@ jobs:
3434
test:
3535
runs-on: ubuntu-20.04
3636
container:
37-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
37+
image: quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212
3838
services:
3939
cassandra:
4040
image: cassandra:3.11
@@ -55,7 +55,7 @@ jobs:
5555
build:
5656
runs-on: ubuntu-20.04
5757
container:
58-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
58+
image: quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212
5959
steps:
6060
- name: Checkout Repo
6161
uses: actions/checkout@v2
@@ -98,8 +98,8 @@ jobs:
9898
- name: Upgrade golang
9999
run: |
100100
cd /tmp
101-
wget https://dl.google.com/go/go1.16.6.linux-amd64.tar.gz
102-
tar -zxvf go1.16.6.linux-amd64.tar.gz
101+
wget https://dl.google.com/go/go1.16.15.linux-amd64.tar.gz
102+
tar -zxvf go1.16.15.linux-amd64.tar.gz
103103
sudo rm -fr /usr/local/go
104104
sudo mv /tmp/go /usr/local/go
105105
cd -
@@ -175,14 +175,14 @@ jobs:
175175
run: |
176176
touch build-image/.uptodate
177177
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
178-
make BUILD_IMAGE=quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f TTY='' configs-integration-test
178+
make BUILD_IMAGE=quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212 TTY='' configs-integration-test
179179
180180
deploy_website:
181181
needs: [build, test]
182182
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
183183
runs-on: ubuntu-20.04
184184
container:
185-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
185+
image: quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212
186186
steps:
187187
- name: Checkout Repo
188188
uses: actions/checkout@v2
@@ -219,7 +219,7 @@ jobs:
219219
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
220220
runs-on: ubuntu-20.04
221221
container:
222-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
222+
image: quay.io/cortexproject/build-image:release-1.11-go-1-16-15-ebfea1212
223223
steps:
224224
- name: Checkout Repo
225225
uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
## master / unreleased
44

55

6+
## 1.11.1 2022-03-08
7+
* [ENHANCEMENT] Build with Go 1.16.15 to address CVE-2022-24921 "stack exhaustion via a deeply nested expression" #4663
8+
69
## 1.11.0 2021-11-25
710
* [BUGFIX] Update go-kit package to fix spurious log messages #4544
811
* [CHANGE] Memberlist: Expose default configuration values to the command line options. Note that setting these explicitly to zero will no longer cause the default to be used. If the default is desired, then do set the option. The following are affected: #4276

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ build-image/$(UPTODATE): build-image/*
119119
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
120120
BUILD_IN_CONTAINER := true
121121
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
122-
LATEST_BUILD_IMAGE_TAG ?= 20210713_update-go-1.16.6-178ab0c4f
122+
LATEST_BUILD_IMAGE_TAG ?= release-1.11-go-1-16-15-ebfea1212
123123

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

build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16.6-buster
1+
FROM golang:1.16.15-buster
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
44
RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \

0 commit comments

Comments
 (0)