Merge branch 'main' into dockerfile-context-build-options

test/cli/server_test.rb

@@ -0,0 +1,16 @@
+require_relative "cli_test_case"
+
+class CliServerTest < CliTestCase
+  test "bootstrap" do
+    run_command("bootstrap").tap do |output|
+      assert_match /which curl/, output
+      assert_match /which docker/, output
+      assert_match /apt-get update -y && apt-get install curl docker.io -y/, output
+    end
+  end
+
+  private
+    def run_command(*command)
+      stdouted { Mrsk::Cli::Server.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+    end
+end

test/commander_test.rb

@@ -42,4 +42,9 @@ class CommanderTest < ActiveSupport::TestCase
     @mrsk.specific_primary!
     assert_equal [ "1.1.1.1" ], @mrsk.hosts
   end
+
+  test "primary_host with specific hosts via role" do
+    @mrsk.specific_roles = "web"
+    assert_equal "1.1.1.1", @mrsk.primary_host
+  end
 end

test/commands/registry_test.rb

@@ -30,6 +30,17 @@ class CommandsRegistryTest < ActiveSupport::TestCase
     ENV.delete("MRSK_REGISTRY_PASSWORD")
   end
 
+  test "registry login with ENV username" do
+    ENV["MRSK_REGISTRY_USERNAME"] = "also-secret"
+    @config[:registry]["username"] = [ "MRSK_REGISTRY_USERNAME" ]
+
+    assert_equal \
+      "docker login hub.docker.com -u also-secret -p secret",
+      @registry.login.join(" ")
+  ensure
+    ENV.delete("MRSK_REGISTRY_USERNAME")
+  end
+
   test "registry logout" do
     assert_equal \
       "docker logout hub.docker.com",

test/commands/traefik_test.rb

@@ -12,6 +12,11 @@ class CommandsTraefikTest < ActiveSupport::TestCase
     assert_equal \
       "docker run --name traefik --detach --restart unless-stopped --log-opt max-size=10m --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format json --metrics.prometheus.buckets 0.1,0.3,1.2,5.0",
       new_command.run.join(" ")
+
+    @config[:traefik]["host_port"] = "8080"
+    assert_equal \
+      "docker run --name traefik --detach --restart unless-stopped --log-opt max-size=10m --publish 8080:80 --volume /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format json --metrics.prometheus.buckets 0.1,0.3,1.2,5.0",
+      new_command.run.join(" ")
   end
 
   test "traefik start" do