Does setting the Docker override in circleCI config work with setup_r…

…emote_docker ?
freedomofpress · Jun 24, 2024 · 7381ad3 · 7381ad3
1 parent aec4ead
commit 7381ad3
Show file tree

Hide file tree

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