spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use docker info to get arch

Browse Source
This commit is contained in:
Donal McBreen
2024-08-28 15:50:46 +01:00
parent eab7d3adc5
commit 5f2384f123
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/commands/builder_test.rb
View File

@@ -145,10 +145,10 @@ class CommandsBuilderTest < ActiveSupport::TestCase
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

2
test/fixtures/deploy_with_remote_builder.yml vendored
View File

@@ -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

2
test/fixtures/deploy_with_remote_builder_and_custom_ports.yml vendored
View File

@@ -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

2
test/integration/docker/deployer/app/config/deploy.yml
View File

@@ -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:

2
test/integration/docker/deployer/app_with_roles/config/deploy.yml
View File

@@ -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: