From e8d0f81ff36c6c47d4ab03d3ce3c040b268e7f54 Mon Sep 17 00:00:00 2001
From: Erez Rokah <erezrokah@users.noreply.github.com>
Date: Mon, 21 Feb 2022 19:02:50 +0100
Subject: [PATCH] chore(ci): use stronger machines (#743)

---
 .circleci/config.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb6741ff..f276feaf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,18 +6,13 @@ orbs:
 commands:
   setup-remote-docker-with-experimental-feats:
     steps:
-      - setup_remote_docker:
-          docker_layer_caching: true
-          version: 20.10.7
       - run:
           # We need this in order to `squash` images
           # https://support.circleci.com/hc/en-us/articles/360050448351-Enabling-Docker-Experimental-Features-on-Remote-Docker
           name: Enable Docker experimental features
           command: |
-            ssh remote-docker \<<EOF
-              sudo bash -c 'echo "{\"experimental\": true}" > /etc/docker/daemon.json'
-              sudo systemctl restart docker
-            EOF
+            sudo bash -c 'echo "{\"experimental\": true}" > /etc/docker/daemon.json'
+            sudo systemctl restart docker
 
   compute-docker-tags:
     parameters:
@@ -133,8 +128,10 @@ jobs:
       push-images:
         type: boolean
         default: true
-    docker:
-      - image: cimg/base:2021.04
+    machine:
+      image: ubuntu-2004:202111-02
+      docker_layer_caching: true
+    resource_class: xlarge
     steps:
       - checkout
       - setup-remote-docker-with-experimental-feats
@@ -186,8 +183,9 @@ jobs:
     parameters:
       container-image:
         type: string
-    docker:
-      - image: cimg/base:2021.04
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
     steps:
       - setup-remote-docker-with-experimental-feats
       # Load the previously saved docker images from the CCI workspace
@@ -211,8 +209,9 @@ jobs:
       squash-images:
         type: boolean
         default: false
-    docker:
-      - image: cimg/base:2021.04
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
     steps:
       # Compute the env vars with the resulting docker tags and docker image names
       - compute-docker-tags: