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

[CHORE] Bump nvmrc and Docker to use Node v20.10.0 #7426

Merged
merged 4 commits into from
Dec 19, 2023
Merged

[CHORE] Bump nvmrc and Docker to use Node v20.10.0 #7426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17b6246
Bumping nvmrc to use v20.10.0.
1Copenut Dec 19, 2023
3c0215d
Moving another env var to Buildkite pre to consolidate location.
1Copenut Dec 19, 2023
31f0221
Bumping Dockerfile to latest v20 LTS slim image.
1Copenut Dec 19, 2023
b965637
Pointing build script to pre_command Docker env var.
1Copenut Dec 19, 2023
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
3 changes: 3 additions & 0 deletions .buildkite/scripts/lifecycle/pre_command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export GCE_ACCOUNT
GITHUB_TOKEN=$(retry 5 vault read -field=github_token $GITHUB_ACCOUNT)
export GITHUB_TOKEN

DOCKER_BASE_IMAGE=docker.elastic.co/eui/ci:6.1
export DOCKER_BASE_IMAGE

GCE_IMAGE=google/cloud-sdk:slim
export GCE_IMAGE

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/pipelines/pipeline_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DOCKER_OPTIONS=(
--user="$(id -u):$(id -g)"
--volume="$(pwd):/app"
--workdir=/app
docker.elastic.co/eui/ci:6.0
"$DOCKER_BASE_IMAGE"
cee-chen marked this conversation as resolved.
Show resolved Hide resolved
)

case $TEST_TYPE in
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.9.0
20.10.0
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "lib",
"module": "es",
"types": "eui.d.ts",
"docker_image": "20.9.0",
"docker_image": "20.10.0",
"engines": {
"node": "16.x || 18.x || >=20.x"
},
Expand All @@ -16,8 +16,6 @@
],
"scripts": {
"start": "cross-env BABEL_MODULES=false webpack serve --config=src-docs/webpack.config.js",
"test-docker": "node ./scripts/test-docker.js",
"test-a11y-docker": "node ./scripts/test-a11y-docker.js",
Comment on lines -19 to -20
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't seem like it should be part of the node upgrade

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's valid. The scripts were removed prior, but I can move the lines back into package.json and remove them as a separate PR.

Copy link
Contributor

@cee-chen cee-chen Dec 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

ahh I hadn't realized! I'm fine removing them in this PR as long as we point it out / it's a deliberate choice; just at first glance I thought it was a mistake

"build-docs": "cross-env BABEL_MODULES=false cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 webpack --config=src-docs/webpack.config.js",
"build": "yarn extract-i18n-strings && node ./scripts/compile-clean.js && node ./scripts/compile-eui.js && yarn compile-scss",
"build-pack": "yarn build && npm pack",
Expand Down
10 changes: 4 additions & 6 deletions scripts/deploy/build_docs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

set -e

NODE_IMG="docker.elastic.co/eui/ci:6.0"

# Compile using node image
echo "Building docs using ${NODE_IMG} Docker image"
docker pull $NODE_IMG
# Compile using base image from pre_command.sh
echo "Building docs using ${DOCKER_BASE_IMAGE} Docker image"
docker pull "$DOCKER_BASE_IMAGE"
docker run \
--rm -i \
--env HOME=/tmp \
--"user=$(id -u)":"$(id -g)" \
--volume "$PWD":/app \
--workdir /app \
$NODE_IMG \
"$DOCKER_BASE_IMAGE" \
bash -c 'yarn && yarn build && yarn build-docs && yarn build-storybook'
2 changes: 1 addition & 1 deletion scripts/docker-ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zenato/docker-puppeteer/blob/master/Dockerfile

# >=12.0 required (for cypress). v18 is LTS.
FROM --platform=linux/amd64 node:20.9.0-slim
FROM --platform=linux/amd64 node:20.10.0-slim

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
Loading