From b2e4da6246705798aa303b3ad0eee6a16d4a1537 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Fri, 26 Nov 2021 15:18:15 +0100
Subject: [PATCH 1/3] Update yarn to 1.22.17

---
 Dockerfile.danger            | 2 +-
 Dockerfile.danger-ruby-2.6.6 | 2 +-
 scripts/custom-docker-build  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.danger b/Dockerfile.danger
index 0ee4df0..fb3b85d 100644
--- a/Dockerfile.danger
+++ b/Dockerfile.danger
@@ -7,7 +7,7 @@ MAINTAINER GitLab Quality Team
 ENV LC_ALL "C.UTF-8"
 
 ENV NODE_VERSION=14.17.2
-ENV YARN_VERSION=1.22.10
+ENV YARN_VERSION=1.22.17
 ENV GITLAB_GEM_VERSION=4.17.0
 ENV DANGER_GEM_VERSION=8.3.1
 ENV DANGER_GITLAB_GEM_VERSION=8.0.0
diff --git a/Dockerfile.danger-ruby-2.6.6 b/Dockerfile.danger-ruby-2.6.6
index ae74d26..390c77f 100644
--- a/Dockerfile.danger-ruby-2.6.6
+++ b/Dockerfile.danger-ruby-2.6.6
@@ -7,7 +7,7 @@ MAINTAINER GitLab Quality Team
 ENV LC_ALL "C.UTF-8"
 
 ENV NODE_VERSION=14.17.2
-ENV YARN_VERSION=1.22.10
+ENV YARN_VERSION=1.22.17
 ENV GITLAB_GEM_VERSION=4.17.0
 ENV DANGER_GEM_VERSION=8.3.1
 ENV DANGER_GITLAB_GEM_VERSION=8.0.0
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 4b6fd62..c4b08f5 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -115,7 +115,7 @@ function print_yarn_args() {
         1.12) YARN_INSTALL_VERSION=1.12.3 ;;
         1.16) YARN_INSTALL_VERSION=1.16.0 ;;
         1.21) YARN_INSTALL_VERSION=1.21.1 ;;
-        1.22) YARN_INSTALL_VERSION=1.22.10 ;;
+        1.22) YARN_INSTALL_VERSION=1.22.17 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
     printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"

From ce4f19b5aa1fd9b82342842cde39621c7cea74ea Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Fri, 26 Nov 2021 15:21:06 +0100
Subject: [PATCH 2/3] Create node v16 versions of our build images

---
 .gitlab/ci/gitlab.images.yml | 4 ++--
 scripts/install-node         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index 5609ac0..e1543af 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -3,7 +3,6 @@
   variables:
     LFS: '2.9'
     CHROME: '97'
-    NODE: '14.15'
     YARN: '1.22'
     GRAPHICSMAGICK: '1.3.36'
   parallel:
@@ -13,6 +12,7 @@
         GIT: ['2.33']
         POSTGRESQL: ['11', '12', '13']
         GOLANG: ['1.16', '1.17']
+        NODE: ['14.15', '16.14']
 
 gitlab test:
   extends:
@@ -28,7 +28,6 @@ gitlab push:
 .gitlab-assets-matrix:
   variables:
     LFS: '2.9'
-    NODE: '14.15'
     YARN: '1.22'
     GRAPHICSMAGICK: '1.3.36'
   parallel:
@@ -36,6 +35,7 @@ gitlab push:
       - DEBIAN: ['bullseye']
         RUBY: ['2.7', '3.0']
         GIT: ['2.31', '2.33']
+        NODE: ['14.15', '16.14']
 
 gitlab-assets test:
   extends:
diff --git a/scripts/install-node b/scripts/install-node
index 9624540..c97019f 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -2,8 +2,8 @@
 set -xeuo pipefail
 IFS=$'\n\t'
 
-NODE_INSTALL_VERSION=${1:-14.16.0}
-YARN_INSTALL_VERSION=${2:-1.22.10}
+NODE_INSTALL_VERSION=${1:-16.14.0}
+YARN_INSTALL_VERSION=${2:-1.22.17}
 
 # Map MAJOR.MINOR.patch -> MAJOR.x
 NODE_MAJOR=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`

From 0c3850f5257a8b8d1876c6925a1eb5dc47b6c932 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Fri, 26 Nov 2021 15:21:32 +0100
Subject: [PATCH 3/3] Update puppeteer image to node@16

---
 Dockerfile.gitlab-puppeteer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.gitlab-puppeteer b/Dockerfile.gitlab-puppeteer
index 0bc6b38..f7a71df 100644
--- a/Dockerfile.gitlab-puppeteer
+++ b/Dockerfile.gitlab-puppeteer
@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:16
 
 ADD /scripts/ /scripts/