Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defaults: &defaults
docker:
# IMPORTANT: whenever you change the build-image version tag, remember to replace it
# across the entire file (there are multiple references).
- image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
- image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP
working_directory: /go/src/github.com/cortexproject/cortex

filters: &filters
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

test:
docker:
- image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
- image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP
- image: cassandra:3.11
environment:
JVM_OPTS: "-Xms1024M -Xmx1024M"
Expand All @@ -111,7 +111,7 @@ jobs:
name: Integration Test
command: |
touch build-image/.uptodate
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 configs-integration-test
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP configs-integration-test

integration:
machine:
Expand Down
9 changes: 0 additions & 9 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ Each step in a job has a clear name that encapsulates the purpose of the command
# commands
```

**Checkout Version**

Current build-image ships with an older version of Git which breaks github/actions@v2 so we are using actions/checkout@v1 for all jobs until the quay image is updated to ship with a more recent version of Git.

```yaml
- name: Checkout Repo
uses: actions/checkout@v1
```

**Symbolic Link to Expected Workspace**

A significant number of commands in the Makefile are hardcoded with an assumed file structure of the CI container. To ensure paths specified in previous commands don’t break, a symlink was created from the hardcoded “expected” working directory `/go/src/github.com/cortexproject/cortex` to the actual working directory `$GITHUB_WORKSPACE`.
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
lint:
runs-on: ubuntu-latest
container:
image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP
steps:
- name: Checkout Repo
uses: actions/checkout@v1
uses: actions/checkout@v2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this build image fixes old Git version problem .There is a mention in .github/README.md about this that should be updated.

- name: Sym Link Expected Path to Workspace
run: |
mkdir -p /go/src/github.com/cortexproject/cortex
Expand All @@ -31,7 +31,7 @@ jobs:
test:
runs-on: ubuntu-latest
container:
image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP
services:
cassandra:
image: cassandra:3.11
Expand All @@ -41,7 +41,7 @@ jobs:
- 9042:9042
steps:
- name: Checkout Repo
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Sym Link Expected Path to Workspace
run: |
mkdir -p /go/src/github.com/cortexproject/cortex
Expand All @@ -52,10 +52,10 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2
image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP
steps:
- name: Checkout Repo
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Install Docker Client
run: |
set -x
Expand Down
4 changes: 2 additions & 2 deletions build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.14.9-stretch
FROM golang:1.14.9-buster
ARG goproxyValue
ENV GOPROXY=${goproxyValue}
RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get install -y nodejs npm && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install website builder dependencies. Whenever you change these version, please also change website/package.json
# and viceversa.
Expand Down
3 changes: 2 additions & 1 deletion docs/contributing/how-to-update-the-build-image.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ The build image currently can only be updated by a Cortex maintainer. If you're
2. Build the image running `make build-image/.uptodate`
3. Publish the image to the repository running `docker push quay.io/cortexproject/build-image:TAG` (this can only be done by a maintainer)
4. Replace the image tag in `.circleci/config.yml` (_there may be multiple references_)
5. Open a PR and make sure the CI with new build-image passes
5. Replace the image tag in `.github/workflows/*` (_there may be multiple references_)
6. Open a PR and make sure the CI with new build-image passes
60 changes: 30 additions & 30 deletions pkg/chunk/purger/delete_plan.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 23 additions & 23 deletions pkg/chunk/storage/caching_index_client.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading