Skip to content

Commit

Permalink
Node Version Upgrade - 14x to 18x (#5906)
Browse files Browse the repository at this point in the history
* Adding node 18 and updating change log

Signed-off-by: Ryan West <[email protected]>

* Adding the new node image version to test-build-deploy yaml file

Signed-off-by: Ryan West <[email protected]>

* Updating the build_image_tag on the Makefile

Signed-off-by: Ryan West <[email protected]>

---------

Signed-off-by: Ryan West <[email protected]>
  • Loading branch information
Kramer0x0 authored Apr 26, 2024
1 parent e74c604 commit 1b0e2ce
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
lint:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
test:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
build:
runs-on: ubuntu-20.04
container:
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -215,14 +215,14 @@ jobs:
run: |
touch build-image/.uptodate
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 TTY='' configs-integration-test
make BUILD_IMAGE=quay.io/cortexproject/build-image:node_version_upgrade-60582e680 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:upgrade-go-to-1.21.9-b37062f16
image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down Expand Up @@ -264,7 +264,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:upgrade-go-to-1.21.9-b37062f16
image: quay.io/cortexproject/build-image:node_version_upgrade-60582e680
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* [CHANGE] Ruler: Remove `experimental.ruler.api-enable-rules-backup` flag and use `ruler.ring.replication-factor` to check if rules backup is enabled

* [ENHANCEMENT] Query Frontend/Querier: Added store gateway postings touched count and touched size in Querier stats and log in Query Frontend. #5892
* [CHANGE] Upgrade Dockerfile Node version from 14x to 18x. #5906

## 1.17.0 in progress

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,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 ?= upgrade-go-to-1.21.9-b37062f16
LATEST_BUILD_IMAGE_TAG ?= node_version_upgrade-60582e680

# 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
2 changes: 1 addition & 1 deletion build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG goproxyValue
ENV GOPROXY=${goproxyValue}
RUN apt-get update && apt-get install -y curl 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 curl -sL https://deb.nodesource.com/setup_18.x | bash -
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
Expand Down

0 comments on commit 1b0e2ce

Please sign in to comment.