From 7c23f0454c36ed7b52dcc140d99ef68dd30f8b14 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <email@paulmelnikow.com>
Date: Tue, 15 Mar 2022 14:30:14 -0400
Subject: [PATCH 1/2] Use new CircleCI "convenience" images

Closes #7724
---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c1b5fda210492..153493311731a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,7 +143,7 @@ package_steps: &package_steps
 jobs:
   main:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.14
         environment:
           NPM_CONFIG_ENGINE_STRICT: 'true'
           NPM_CONFIG_STRICT_PEER_DEPS: 'true'
@@ -152,13 +152,13 @@ jobs:
 
   main@node-17:
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:17.7
 
     <<: *main_steps
 
   integration:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.14
         environment:
           NPM_CONFIG_ENGINE_STRICT: 'true'
           NPM_CONFIG_STRICT_PEER_DEPS: 'true'
@@ -168,14 +168,14 @@ jobs:
 
   integration@node-17:
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:17.7
       - image: redis
 
     <<: *integration_steps
 
   danger:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.14
     steps:
       - checkout
 
@@ -195,7 +195,7 @@ jobs:
 
   frontend:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.14
         environment:
           NPM_CONFIG_ENGINE_STRICT: 'true'
           NPM_CONFIG_STRICT_PEER_DEPS: 'true'
@@ -241,7 +241,7 @@ jobs:
 
   services:
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.14
         environment:
           NPM_CONFIG_ENGINE_STRICT: 'true'
           NPM_CONFIG_STRICT_PEER_DEPS: 'true'
@@ -250,7 +250,7 @@ jobs:
 
   services@node-17:
     docker:
-      - image: circleci/node:17
+      - image: cimg/node:17.7
 
     <<: *services_steps
 

From 1d608620b90e8364c2c5fa71f67f31c4360b055b Mon Sep 17 00:00:00 2001
From: chris48s <chris.shaw480@gmail.com>
Date: Thu, 24 Mar 2022 17:13:01 +0000
Subject: [PATCH 2/2] update image for package build

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 153493311731a..8f778e2c014a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -235,7 +235,8 @@ jobs:
           command: npm run build
 
   package:
-    machine: true
+    machine:
+      image: 'ubuntu-2004:202111-02'
 
     <<: *package_steps