From f3a6fe9c78e7d02f7dc28954d18f5df8b811a39d Mon Sep 17 00:00:00 2001 From: Grzegorz Zdunek Date: Fri, 4 Oct 2024 17:05:53 +0200 Subject: [PATCH 1/2] Use Debian Bullseye instead of EOL Debian Buster --- build.assets/Dockerfile-node | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.assets/Dockerfile-node b/build.assets/Dockerfile-node index c72b24376980e..ce7d0d5aac166 100644 --- a/build.assets/Dockerfile-node +++ b/build.assets/Dockerfile-node @@ -4,17 +4,18 @@ # to build the Teleport Connect. It can also be used to build the # web assets for the Teleport UI. # -# This image is base on the node image, which is based on Debian Buster. -# Using it as a image allows us to link agains the same version of -# glibc as Node.js. +# This image is base on the node image, which is based on Debian Bullseye. +# Using it as an image allows us to link against the oldest version of glibc +# supported by Node.js Docker images. # # Check the README to learn how to safely introduce changes to Dockerfiles. ## BUILDBOX-NODE ################################################################### -# Pin the tag to Debian Buster to make sure the Glibc compatibility. +# Pin the tag to Debian Bullseye to make sure the glibc compatibility +# (glibc version of Bullseye is 2.31). ARG NODE_VERSION -FROM node:${NODE_VERSION}-buster AS buildbox +FROM node:${NODE_VERSION}-bullseye AS buildbox # BUILDARCH is automatically set by DOCKER when building the image with Build Kit (MacOS by deafult). # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope From 8b9a28fed10dfba71e428fe6a75444580234fbb2 Mon Sep 17 00:00:00 2001 From: Grzegorz Zdunek Date: Fri, 4 Oct 2024 17:05:56 +0200 Subject: [PATCH 2/2] Update Node.js to 20.17 --- build.assets/versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.assets/versions.mk b/build.assets/versions.mk index 28f9cff800068..17a89a06bce84 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -6,7 +6,7 @@ GOLANG_VERSION ?= go1.22.8 GOLANGCI_LINT_VERSION ?= v1.61.0 -NODE_VERSION ?= 20.14.0 +NODE_VERSION ?= 20.17.0 # Run lint-rust check locally before merging code after you bump this. RUST_VERSION ?= 1.77.0