Revert "Does setting the Docker override in circleCI config work with…

… setup_remote_docker ?" This reverts commit 4a8e89b.
freedomofpress · Jun 25, 2024 · ffa597b · ffa597b
1 parent 4a8e89b
commit ffa597b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -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