Skip to content

Commit 03b423f

Browse files
pstibranyalvinlin123
authored andcommitted
Rebuild and update build image from master. (cortexproject#4604)
* Update build image. Signed-off-by: Peter Štibraný <[email protected]> * CHANGELOG.md Signed-off-by: Peter Štibraný <[email protected]> Signed-off-by: Alvin Lin <[email protected]>
1 parent 6653346 commit 03b423f

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

+6-6
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:master-f0c5aab05
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:master-f0c5aab05
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:master-f0c5aab05
5959
steps:
6060
- name: Checkout Repo
6161
uses: actions/checkout@v2
@@ -171,14 +171,14 @@ jobs:
171171
run: |
172172
touch build-image/.uptodate
173173
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
174-
make BUILD_IMAGE=quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f TTY='' configs-integration-test
174+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-f0c5aab05 TTY='' configs-integration-test
175175
176176
deploy_website:
177177
needs: [build, test]
178178
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
179179
runs-on: ubuntu-20.04
180180
container:
181-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
181+
image: quay.io/cortexproject/build-image:master-f0c5aab05
182182
steps:
183183
- name: Checkout Repo
184184
uses: actions/checkout@v2
@@ -215,7 +215,7 @@ jobs:
215215
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
216216
runs-on: ubuntu-20.04
217217
container:
218-
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
218+
image: quay.io/cortexproject/build-image:master-f0c5aab05
219219
steps:
220220
- name: Checkout Repo
221221
uses: actions/checkout@v2

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
* [FEATURE] AlertManager: Add support for SNS Receiver. #4382
1010
=======
1111

12-
* [ENHANCEMENT] Keep track of discarded samples due to relabel configuration in `cortex_discarded_samples_total`. #4503
1312
* [CHANGE] Changed default for `-ingester.min-ready-duration` from 1 minute to 15 seconds. #4539
1413
* [CHANGE] query-frontend: Do not print anything in the logs of `query-frontend` if a in-progress query has been canceled (context canceled). #4562
1514
* [CHANGE] Compactor block deletion mark migration, needed when upgrading from v1.7, is now disabled by default. #4597
15+
* [ENHANCEMENT] Update Go version to 1.17.5. #4602 #4604
16+
* [ENHANCEMENT] Keep track of discarded samples due to relabel configuration in `cortex_discarded_samples_total`. #4503
1617
* [ENHANCEMENT] Ruler: Add `-ruler.disable-rule-group-label` to disable the `rule_group` label on exported metrics. #4571
1718
* [ENHANCEMENT] Query federation: improve performance in MergeQueryable by memoizing labels. #4502
1819
* [ENHANCEMENT] Added new ring related config `-ingester.readiness-check-ring-health` when enabled the readiness probe will succeed only after all instances are ACTIVE and healthy in the ring, this is enabled by default. #4539

Makefile

+1-1
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 ?= master-f0c5aab05
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

0 commit comments

Comments
 (0)