From c751bf135e5cbe6c10db31eef20c589c7917e8d0 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Mon, 2 Oct 2023 14:24:58 -0700 Subject: [PATCH] devops: stop using deprecated method of installing node (#27392) Otherwise we see a warning for 1 minute every time during the script run: image The instructions are taken from https://github.com/nodesource/distributions#debian-and-ubuntu-based-distributions --- utils/docker/Dockerfile.focal | 7 +++++-- utils/docker/Dockerfile.jammy | 7 +++++-- utils/linux-browser-dependencies/inside_docker/process.sh | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal index 69dd65bf32..bf11ac3726 100644 --- a/utils/docker/Dockerfile.focal +++ b/utils/docker/Dockerfile.focal @@ -8,8 +8,11 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright:v%version%-focal" RUN apt-get update && \ # Install Node 18 - apt-get install -y curl wget gpg && \ - curl -sL https://deb.nodesource.com/setup_18.x | bash - && \ + apt-get install -y curl wget gpg ca-certificates && \ + mkdir -p /etc/apt/keyrings && \ + curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && \ apt-get install -y nodejs && \ # Feature-parity with node.js base images. apt-get install -y --no-install-recommends git openssh-client && \ diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy index 73476104a0..56ac85f790 100644 --- a/utils/docker/Dockerfile.jammy +++ b/utils/docker/Dockerfile.jammy @@ -8,8 +8,11 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright:v%version%-jammy" RUN apt-get update && \ # Install Node 18 - apt-get install -y curl wget gpg && \ - curl -sL https://deb.nodesource.com/setup_18.x | bash - && \ + apt-get install -y curl wget gpg ca-certificates && \ + mkdir -p /etc/apt/keyrings && \ + curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && \ apt-get install -y nodejs && \ # Feature-parity with node.js base images. apt-get install -y --no-install-recommends git openssh-client && \ diff --git a/utils/linux-browser-dependencies/inside_docker/process.sh b/utils/linux-browser-dependencies/inside_docker/process.sh index 19d11c954c..a3fa26afcb 100755 --- a/utils/linux-browser-dependencies/inside_docker/process.sh +++ b/utils/linux-browser-dependencies/inside_docker/process.sh @@ -7,9 +7,11 @@ export TZ=America/Los_Angeles # Install Node.js apt-get update && \ - apt-get install -y --no-install-recommends ca-certificates && \ - apt-get install -y --no-install-recommends curl && \ - curl -sL https://deb.nodesource.com/setup_18.x | bash - && \ + apt-get install -y --no-install-recommends ca-certificates curl gnupg && \ + mkdir -p /etc/apt/keyrings && \ + curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \ + apt-get update && \ apt-get install -y --no-install-recommends nodejs # Install apt-file