diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index ad499b5dcd..036184f432 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b7094542..f6fcd51543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Makefile b/Makefile index e59ccfb501..7c0c10a337 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 93d49739ac..d02887a345 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -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