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

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 098bb1d7c0..4fc6fb0a18 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -280,19 +280,6 @@ 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 ff80aa107e..92de93b796 100755
--- a/devops/gce-nested/ci-go.sh
+++ b/devops/gce-nested/ci-go.sh
@@ -14,6 +14,12 @@ 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