Skip to content

Commit

Permalink
[CHORE] Bump nvmrc and Docker to use Node v20.10.0 (#7426)
Browse files Browse the repository at this point in the history
  • Loading branch information
1Copenut authored Dec 19, 2023
1 parent cd9a063 commit d2c55e7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .buildkite/scripts/lifecycle/pre_command.sh
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
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"
)

case $TEST_TYPE in
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
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
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",
"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
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
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

0 comments on commit d2c55e7

Please sign in to comment.