[ubicloud] Add custom docker configuration

Moving these steps to image generation to speed up provisioning ubicloud/ubicloud#2371
ubicloud · Jan 9, 2025 · 982da8a · 982da8a
1 parent 328a891
commit 982da8a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 0 deletions.
diff --git a/images/ubuntu/scripts/ubicloud/configure-docker.sh b/images/ubuntu/scripts/ubicloud/configure-docker.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -xe
+
+DEFAULT_DOCKER_CONFIG='{
+  "experimental": false,
+  "dns-opts": [
+    "attempts:3"
+  ]
+}'
+
+if [ -f "/etc/docker/daemon.json" ]; then
+    existing_config=$(sudo cat /etc/docker/daemon.json)
+else
+    existing_config="{}"
+fi
+
+echo "$existing_config" | jq ". += $DEFAULT_DOCKER_CONFIG" | sudo tee /etc/docker/daemon.json
+
+sudo systemctl restart docker
diff --git a/images/ubuntu/templates/ubuntu-20.04.arm64.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.arm64.pkr.hcl
@@ -452,6 +452,7 @@ build {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh"
     ]
   }

diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl
@@ -444,6 +444,7 @@ build {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh"
     ]
   }

diff --git a/images/ubuntu/templates/ubuntu-22.04.arm64.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.arm64.pkr.hcl
@@ -440,6 +440,7 @@ build {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh"
     ]
   }

diff --git a/images/ubuntu/templates/ubuntu-22.04.gpu.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.gpu.pkr.hcl
@@ -369,6 +369,7 @@ build {
       "${path.root}/../scripts/ubicloud/nvidia-driver.sh",
       "${path.root}/../scripts/ubicloud/nvidia-container-toolkit.sh",
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh",
       "${path.root}/../scripts/ubicloud/install-packages.sh",
       "${path.root}/../scripts/ubicloud/generalize-image.sh"

diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl
@@ -433,6 +433,7 @@ build {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh"
     ]
   }

diff --git a/images/ubuntu/templates/ubuntu-24.04.arm64.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.arm64.pkr.hcl
@@ -412,6 +412,7 @@ provisioner "shell" {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts          = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh",
       "${path.root}/../scripts/ubicloud/install-packages.sh",
       "${path.root}/../scripts/ubicloud/generalize-image.sh"

diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
@@ -414,6 +414,7 @@ provisioner "shell" {
     execute_command  = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
     scripts          = [
       "${path.root}/../scripts/ubicloud/setup-runner-user.sh",
+      "${path.root}/../scripts/ubicloud/configure-docker.sh",
       "${path.root}/../scripts/ubicloud/install-cache-proxy.sh",
       "${path.root}/../scripts/ubicloud/install-packages.sh",
       "${path.root}/../scripts/ubicloud/generalize-image.sh"