diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh index 744021a0b3a..ffaac1b0f88 100644 --- a/.buildkite/scripts/lifecycle/pre_command.sh +++ b/.buildkite/scripts/lifecycle/pre_command.sh @@ -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 diff --git a/.buildkite/scripts/pipelines/pipeline_test.sh b/.buildkite/scripts/pipelines/pipeline_test.sh index 660ae060caf..655c0f0d1f4 100644 --- a/.buildkite/scripts/pipelines/pipeline_test.sh +++ b/.buildkite/scripts/pipelines/pipeline_test.sh @@ -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 diff --git a/.nvmrc b/.nvmrc index f3f52b42d3d..d5a159609d0 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.9.0 +20.10.0 diff --git a/package.json b/package.json index cd79f8a4e63..940b8a603d7 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -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", diff --git a/scripts/deploy/build_docs b/scripts/deploy/build_docs index c15dd68305f..340f7e329e9 100755 --- a/scripts/deploy/build_docs +++ b/scripts/deploy/build_docs @@ -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' diff --git a/scripts/docker-ci/Dockerfile b/scripts/docker-ci/Dockerfile index 9b9dbd165b3..93ce186bbd0 100644 --- a/scripts/docker-ci/Dockerfile +++ b/scripts/docker-ci/Dockerfile @@ -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"]