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"

test/fixtures/deploy.erb.yml

@@ -9,5 +9,3 @@ registry:
   server: registry.digitalocean.com
   username: <%= "my-user" %>
   password: <%= "my-password" %>
-builder:
-  arch: amd64

test/fixtures/deploy_for_dest.yml

@@ -4,5 +4,3 @@ registry:
   server: registry.digitalocean.com
   username: <%= "my-user" %>
   password: <%= "my-password" %>
-builder:
-  arch: amd64

test/fixtures/deploy_for_required_dest.yml

@@ -4,6 +4,4 @@ registry:
   server: registry.digitalocean.com
   username: <%= "my-user" %>
   password: <%= "my-password" %>
-builder:
-  arch: amd64
 require_destination: true

test/fixtures/deploy_primary_web_role_override.yml

@@ -17,6 +17,4 @@ registry:
   server: registry.digitalocean.com
   username: user
   password: pw
-builder:
-  arch: amd64
 primary_role: web_tokyo

test/fixtures/deploy_simple.yml

@@ -6,5 +6,3 @@ servers:
 registry:
   username: user
   password: pw
-builder:
-  arch: amd64

test/fixtures/deploy_with_accessories.yml

@@ -10,8 +10,6 @@ servers:
 registry:
   username: user
   password: pw
-builder:
-  arch: amd64
 
 accessories:
   mysql:

test/fixtures/deploy_with_aliases.yml

@@ -11,8 +11,6 @@ servers:
   console:
     hosts:
       - 1.1.1.5
-builder:
-  arch: amd64
 registry:
   username: user
   password: pw

test/fixtures/deploy_with_assets.yml

@@ -6,6 +6,4 @@ servers:
 registry:
   username: user
   password: pw
-builder:
-  arch: amd64
 asset_path: /public/assets

test/fixtures/deploy_with_boot_strategy.yml

@@ -7,8 +7,6 @@ servers:
   workers:
     - "1.1.1.3"
     - "1.1.1.4"
-builder:
-  arch: amd64
 
 registry:
   username: user

test/fixtures/deploy_with_env_tags.yml

@@ -11,8 +11,6 @@ servers:
     - 1.1.1.4: site1
     - 1.2.1.3: site2
     - 1.2.1.4: [ site2 experimental ]
-builder:
-  arch: amd64
 env:
   clear:
     TEST: "root"

test/fixtures/deploy_with_extensions.yml

@@ -21,6 +21,4 @@ registry:
   server: registry.digitalocean.com
   username: user
   password: pw
-builder:
-  arch: amd64
 primary_role: web_tokyo

test/fixtures/deploy_with_low_percentage_boot_strategy.yml

@@ -7,8 +7,6 @@ servers:
   workers:
     - "1.1.1.3"
     - "1.1.1.4"
-builder:
-  arch: amd64
 
 registry:
   username: user

test/fixtures/deploy_with_multiple_traefik_roles.yml

@@ -26,8 +26,6 @@ servers:
     hosts:
       - 1.1.1.3
       - 1.1.1.4
-builder:
-  arch: amd64
 env:
   REDIS_URL: redis://x/y
 registry:

test/fixtures/deploy_with_percentage_boot_strategy.yml

@@ -7,8 +7,6 @@ servers:
   workers:
     - "1.1.1.3"
     - "1.1.1.4"
-builder:
-  arch: amd64
 
 registry:
   username: user

test/fixtures/deploy_with_remote_builder.yml

@@ -32,11 +32,10 @@ accessories:
     port: 6379
     directories:
       - data:/data
-builder:
-  arch: amd64
 
 readiness_delay: 0
 
 builder:
-  arch: <%= Kamal::Utils.docker_arch == "arm64" ? "amd64" : "arm64" %>
-  remote: ssh://app@1.1.1.5
+  remote:
+    arch: amd64
+    host: ssh://app@1.1.1.5

test/fixtures/deploy_with_remote_builder_and_custom_ports.yml

@@ -32,8 +32,6 @@ accessories:
     port: 6379
     directories:
       - data:/data
-builder:
-  arch: amd64
 
 readiness_delay: 0
 
@@ -42,5 +40,6 @@ ssh:
   port: 22
 
 builder:
-  arch: <%= Kamal::Utils.docker_arch == "arm64" ? "amd64" : "arm64" %>
-  remote: ssh://app@1.1.1.5:2122
+  remote:
+    arch: amd64
+    host: ssh://app@1.1.1.5:2122

test/fixtures/deploy_with_roles.yml

@@ -14,5 +14,3 @@ registry:
   server: registry.digitalocean.com
   username: user
   password: pw
-builder:
-  arch: amd64

test/fixtures/deploy_with_secrets.yml

@@ -9,5 +9,3 @@ registry:
 env:
   secret:
     - PASSWORD
-builder:
-  arch: amd64

test/fixtures/deploy_with_two_roles_one_host.yml

@@ -13,5 +13,3 @@ registry:
   server: registry.digitalocean.com
   username: user
   password: pw
-builder:
-  arch: amd64

test/fixtures/deploy_with_uncommon_hostnames.yml

@@ -6,5 +6,3 @@ servers:
 registry:
   username: user
   password: pw
-builder:
-  arch: amd64

test/fixtures/deploy_without_clone.yml

@@ -36,5 +36,4 @@ accessories:
 readiness_delay: 0
 
 builder:
-  arch: amd64
   context: "."

test/fixtures/deploy_workers_only.yml

@@ -10,5 +10,3 @@ primary_role: workers
 registry:
   username: user
   password: pw
-builder:
-  arch: amd64