Use docker info to get arch

basecamp · Aug 28, 2024 · ce5b6cc · ce5b6cc
1 parent 4e37ffd
commit ce5b6cc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/lib/kamal/configuration/builder.rb b/lib/kamal/configuration/builder.rb
@@ -29,9 +29,7 @@ def arches
 
   def local_arches
     @local_arches ||= if remote
-      uname_m = `uname -m`.strip
-      local_arch = uname_m == "x86_64" ? "amd64" : uname_m
-      arches & [ local_arch ]
+      arches & [ Kamal::Utils.docker_arch ]
     else
       arches
     end

diff --git a/lib/kamal/utils.rb b/lib/kamal/utils.rb
@@ -77,4 +77,16 @@ def filter_specific_items(filters, items)
   def stable_sort!(elements, &block)
     elements.sort_by!.with_index { |element, index| [ block.call(element), index ] }
   end
+
+  def docker_arch
+    arch = `docker info --format '{{.Architecture}}'`.strip
+    case arch
+    when /aarch64/
+      "arm64"
+    when /x86_64/
+      "amd64"
+    else
+      arch
+    end
+  end
 end
diff --git a/test/commands/builder_test.rb b/test/commands/builder_test.rb
@@ -145,10 +145,10 @@ def build_directory
     end
 
     def local_arch
-      `uname -m`.strip == "x86_64" ? "amd64" : "arm64"
+      Kamal::Utils.docker_arch
     end
 
     def remote_arch
-      `uname -m`.strip == "x86_64" ? "arm64" : "amd64"
+      Kamal::Utils.docker_arch == "arm64" ? "amd64" : "arm64"
     end
 end
diff --git a/test/fixtures/deploy_with_remote_builder.yml b/test/fixtures/deploy_with_remote_builder.yml
@@ -38,5 +38,5 @@ builder:
 readiness_delay: 0
 
 builder:
-  arch: <%= `uname -m`.strip == "x86_64" ? "arm64" : "amd64" %>
+  arch: <%= Kamal::Utils.docker_arch == "arm64" ? "amd64" : "arm64" %>
   remote: ssh://app@1.1.1.5
diff --git a/test/fixtures/deploy_with_remote_builder_and_custom_ports.yml b/test/fixtures/deploy_with_remote_builder_and_custom_ports.yml
@@ -42,5 +42,5 @@ ssh:
   port: 22
 
 builder:
-  arch: <%= `uname -m`.strip == "x86_64" ? "arm64" : "amd64" %>
+  arch: <%= Kamal::Utils.docker_arch == "arm64" ? "amd64" : "arm64" %>
   remote: ssh://app@1.1.1.5:2122
diff --git a/test/integration/docker/deployer/app/config/deploy.yml b/test/integration/docker/deployer/app/config/deploy.yml
@@ -24,7 +24,7 @@ registry:
   password: root
 builder:
   driver: docker
-  arch: <%= uname_m = `uname -m`; uname_m == "x86_64" ? "amd64" : uname_m %>
+  arch: <%= Kamal::Utils.docker_arch %>
   args:
     COMMIT_SHA: <%= `git rev-parse HEAD` %>
 healthcheck:

diff --git a/test/integration/docker/deployer/app_with_roles/config/deploy.yml b/test/integration/docker/deployer/app_with_roles/config/deploy.yml
@@ -18,7 +18,7 @@ registry:
   password: root
 builder:
   driver: docker
-  arch: <%= uname_m = `uname -m`; uname_m == "x86_64" ? "amd64" : uname_m %>
+  arch: <%= Kamal::Utils.docker_arch %>
   args:
     COMMIT_SHA: <%= `git rev-parse HEAD` %>
 healthcheck: