From e58fdde1cbc272d516646dd8ad3148e7f5e31415 Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Tue, 20 Dec 2022 00:07:55 +1100 Subject: [PATCH 1/3] Revert "Update Node 16.18.1 for latest security release (#22019)" This reverts commit 736b4283b0936134e83092f8b16d686f6478a51f. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce7f4d718..85ef47b1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim -ARG NODE_VERSION="16.18.1-bullseye-slim" +ARG NODE_VERSION="16.17.1-bullseye-slim" FROM ghcr.io/moritzheiber/ruby-jemalloc:3.0.4-slim as ruby FROM node:${NODE_VERSION} as build @@ -37,7 +37,7 @@ RUN apt-get update && \ bundle config set --local without 'development test' && \ bundle config set silence_root_warning true && \ bundle install -j"$(nproc)" && \ - yarn install --pure-lockfile --network-timeout 600000 + yarn install --pure-lockfile FROM node:${NODE_VERSION} From 524a707348eb41a8ea34c81ec0eb15f8c9da6699 Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Tue, 20 Dec 2022 01:15:21 +1100 Subject: [PATCH 2/3] Reintroduce yarn change to gauge performance impact --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85ef47b1d..1352f7489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN apt-get update && \ bundle config set --local without 'development test' && \ bundle config set silence_root_warning true && \ bundle install -j"$(nproc)" && \ - yarn install --pure-lockfile + yarn install --pure-lockfile --network-timeout 600000 FROM node:${NODE_VERSION} From 57c23cdbdeadf95df9dc4949b9147bad3c26d37d Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Tue, 20 Dec 2022 01:19:12 +1100 Subject: [PATCH 3/3] Bump to Node 16.19.0 to gauge performance --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1352f7489..76467d712 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim -ARG NODE_VERSION="16.17.1-bullseye-slim" +ARG NODE_VERSION="16.19.0-bullseye-slim" FROM ghcr.io/moritzheiber/ruby-jemalloc:3.0.4-slim as ruby FROM node:${NODE_VERSION} as build