Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild and update build image from master. #4604

Merged
merged 2 commits into from
Jan 7, 2022
Merged

Rebuild and update build image from master. #4604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06b324
Update build image.
pstibrany Jan 6, 2022
db6f375
CHANGELOG.md
pstibrany Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/test-build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
lint:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
image: quay.io/cortexproject/build-image:master-f0c5aab05
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand All @@ -34,7 +34,7 @@ jobs:
test:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
image: quay.io/cortexproject/build-image:master-f0c5aab05
services:
cassandra:
image: cassandra:3.11
Expand All @@ -55,7 +55,7 @@ jobs:
build:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f
image: quay.io/cortexproject/build-image:master-f0c5aab05
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -171,14 +171,14 @@ jobs:
run: |
touch build-image/.uptodate
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
make BUILD_IMAGE=quay.io/cortexproject/build-image:20210713_update-go-1.16.6-178ab0c4f TTY='' configs-integration-test
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-f0c5aab05 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:20210713_update-go-1.16.6-178ab0c4f
image: quay.io/cortexproject/build-image:master-f0c5aab05
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -215,7 +215,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:20210713_update-go-1.16.6-178ab0c4f
image: quay.io/cortexproject/build-image:master-f0c5aab05
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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 ?= 20210713_update-go-1.16.6-178ab0c4f
LATEST_BUILD_IMAGE_TAG ?= master-f0c5aab05

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