From 8103c3e2c883d9170b64bfcc37cc3448c11ea36a Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 30 Mar 2020 12:01:45 +0200
Subject: [PATCH] CircleCI: Fix cross platform Docker builds (#23192)

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f205451e13..5f094a59b61 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -560,6 +560,9 @@ jobs:
       ubuntu:
         type: boolean
     executor: base
+    environment:
+      # Required for building cross-platform images
+      DOCKER_BUILDKIT: 1
     steps:
       - run:
           name: Exit if enterprise and forked PR
@@ -572,7 +575,9 @@ jobs:
       - run:
           name: CI job started
           command: ./scripts/ci-job-started.sh
-      - setup_remote_docker
+      - setup_remote_docker:
+          # This version is necessary for building cross-platform images
+          version: 18.09.3
       - install-google-cloud-sdk
       - install-grabpl
       - run: