Skip to content

Commit d5c12d0

Browse files
alvinlin123rokh-conduktorfriedrichg
authored
upgrade to go 1.20.4 (#5299) (#5331)
* upgrade to go 1.20.3 * align on pr name ? * Update build-image/Dockerfile * Update test-build-deploy.yml with build image tag * Update Makefile * Remove python-request and python-yaml in build-image/Dockerfile --------- Signed-off-by: rokh-conduktor <[email protected]> Signed-off-by: Alvin Lin <[email protected]> Co-authored-by: rokh-conduktor <[email protected]> Co-authored-by: Friedrich Gonzalez <[email protected]>
1 parent 3d94719 commit d5c12d0

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
runs-on: ubuntu-20.04
1313
container:
14-
image: quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159
14+
image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
1515
steps:
1616
- name: Checkout Repo
1717
uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
4040
test:
4141
runs-on: ubuntu-20.04
4242
container:
43-
image: quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159
43+
image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
4444
steps:
4545
- name: Checkout Repo
4646
uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
5959
build:
6060
runs-on: ubuntu-20.04
6161
container:
62-
image: quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159
62+
image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
6363
steps:
6464
- name: Checkout Repo
6565
uses: actions/checkout@v2
@@ -189,14 +189,14 @@ jobs:
189189
run: |
190190
touch build-image/.uptodate
191191
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
192-
make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159 TTY='' configs-integration-test
192+
make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5 TTY='' configs-integration-test
193193
194194
deploy_website:
195195
needs: [build, test]
196196
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
197197
runs-on: ubuntu-20.04
198198
container:
199-
image: quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159
199+
image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
200200
steps:
201201
- name: Checkout Repo
202202
uses: actions/checkout@v2
@@ -238,7 +238,7 @@ jobs:
238238
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
239239
runs-on: ubuntu-20.04
240240
container:
241-
image: quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159
241+
image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
242242
steps:
243243
- name: Checkout Repo
244244
uses: actions/checkout@v2

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
122122
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
123123
BUILD_IN_CONTAINER := true
124124
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
125-
LATEST_BUILD_IMAGE_TAG ?= upgrade-to-go1.20.1-e6945e022
125+
LATEST_BUILD_IMAGE_TAG ?= upgrade-to-go-1.20.4-6025f83e5
126126

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

build-image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM golang:1.20.1-buster
1+
FROM golang:1.20.4-bullseye
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
4-
RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \
4+
RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \
55
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
66
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
77
RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

0 commit comments

Comments
 (0)