Revert "Simplify builders config"

This commit is contained in:
Donal McBreen
2024-08-29 20:16:34 +01:00
committed by GitHub
parent 6adf3c117f
commit 459ba95bbf
64 changed files with 538 additions and 388 deletions

View File

@@ -23,8 +23,7 @@ registry:
username: root
password: root
builder:
driver: docker
arch: <%= Kamal::Utils.docker_arch %>
multiarch: false
args:
COMMIT_SHA: <%= `git rev-parse HEAD` %>
healthcheck:

View File

@@ -17,8 +17,7 @@ registry:
username: root
password: root
builder:
driver: docker
arch: <%= Kamal::Utils.docker_arch %>
multiarch: false
args:
COMMIT_SHA: <%= `git rev-parse HEAD` %>
healthcheck:

View File

@@ -77,7 +77,7 @@ class MainTest < IntegrationTest
assert_equal "app-#{version}", config[:service_with_version]
assert_equal [], config[:volume_args]
assert_equal({ user: "root", port: 22, keepalive: true, keepalive_interval: 30, log_level: :fatal }, config[:ssh_options])
assert_equal({ "driver" => "docker", "arch" => "amd64", "args" => { "COMMIT_SHA" => version } }, config[:builder])
assert_equal({ "multiarch" => false, "args" => { "COMMIT_SHA" => version } }, config[:builder])
assert_equal [ "--log-opt", "max-size=\"10m\"" ], config[:logging]
assert_equal({ "cmd"=>"wget -qO- http://localhost > /dev/null || exit 1", "interval"=>"1s", "max_attempts"=>3, "port"=>3000, "path"=>"/up", "cord"=>"/tmp/kamal-cord", "log_lines"=>50 }, config[:healthcheck])
end