From 37aead86ae4534c8a71c63939dbc1118cbce4502 Mon Sep 17 00:00:00 2001
From: dschom <dschomburg@mozilla.com>
Date: Mon, 28 Nov 2022 11:39:03 -0800
Subject: [PATCH] task(ci): Enable docker layer caching

Because:
- We want to speed up build times

This Commit:
- Adds docker_layer_caching directive
- Makes sure buildkit is enabled where possible
---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 302346ef7d..a65b89a82c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -234,9 +234,12 @@ jobs:
     resource_class: small
     docker:
       - image: cimg/node:16.13
+    environment:
+      DOCKER_BUILDKIT: 1
     steps:
       - checkout
       - setup_remote_docker:
+          version: 18.09.3
           docker_layer_caching: true
       - run:
           name: Build docker fxa ci image
@@ -258,6 +261,7 @@ jobs:
       - base-install
       - setup_remote_docker:
           version: 18.09.3
+          docker_layer_caching: true
       - run:
           name: Build docker images
           command: ./.circleci/build-all.sh
@@ -439,7 +443,6 @@ workflows:
             branches:
               only:
                 - main
-                - FXA-6260
             tags:
               ignore: /.*/