From 7381ad37fea017e328559bed8304ff2f02c45361 Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Tue, 25 Jun 2024 09:52:55 +1000
Subject: [PATCH] Does setting the Docker override in circleCI config work with
 setup_remote_docker ?

---
 .circleci/config.yml       | 13 +++++++++++++
 devops/gce-nested/ci-go.sh |  6 ------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fc6fb0a18..885edbe75c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -280,6 +280,19 @@ jobs:
 
     working_directory: ~/sd
     steps:
+      - setup_remote_docker:
+         version: "26.0.2"
+      - run:
+         command: |
+           ssh remote-docker "sudo mkdir -p /etc/systemd/system/docker.service.d"
+           cat \<< EOF ssh remote-docker "sudo tee -a /etc/systemd/system/docker.service.d/env.conf"
+           {
+           [Service]
+           Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=true"
+           }
+           EOF
+           ssh remote-docker "sudo systemctl daemon-reload"
+           ssh remote-docker "sudo systemctl restart docker"
       - checkout
       - *rebaseontarget
       - *installenchant
diff --git a/devops/gce-nested/ci-go.sh b/devops/gce-nested/ci-go.sh
index 92de93b796..ff80aa107e 100755
--- a/devops/gce-nested/ci-go.sh
+++ b/devops/gce-nested/ci-go.sh
@@ -14,12 +14,6 @@ set -o pipefail
 
 export BASE_OS="${BASE_OS:-focal}"
 
-# Temporary workaround for old gcloud-sdk image
-sudo mkdir -p /etc/systemd/system/docker.service.d
-echo -e "[Service]\nEnvironment=\"DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=true\"" | sudo tee -a /etc/systemd/system/docker.service.d/env.conf
-sudo systemctl daemon-reload
-sudo systemctl restart docker
-
 ./devops/gce-nested/gce-start.sh
 ./devops/gce-nested/gce-runner.sh
 ./devops/gce-nested/gce-stop.sh