Merge remote-tracking branch 'origin/revert-905-simplify-builders-config' into proxy-experimental-and-revert-905-simplify-builders-config

* origin/revert-905-simplify-builders-config: Revert "Simplify builders config"
2024-08-29 20:18:17 +01:00
parent 01d08738ff 459ba95bbf
commit b21af0f5b3
64 changed files with 538 additions and 388 deletions
--- a/test/integration/docker/deployer/app/config/deploy.yml
+++ b/test/integration/docker/deployer/app/config/deploy.yml
@@ -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:
--- a/test/integration/docker/deployer/app_with_roles/config/deploy.yml
+++ b/test/integration/docker/deployer/app_with_roles/config/deploy.yml
@@ -22,8 +22,7 @@ registry:
  username: root
  password: root
 builder:
-  driver: docker
-  arch: <%= Kamal::Utils.docker_arch %>
+  multiarch: false
  args:
    COMMIT_SHA: <%= `git rev-parse HEAD` %>
 healthcheck: