Bump version for 0.6.1

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrsk (0.6.3)
+    mrsk (0.6.1)
       activesupport (>= 7.0)
       dotenv (~> 2.8)
       sshkit (~> 1.21)

README.md

@@ -43,13 +43,11 @@ This will:
 
 Voila! All the servers are now serving the app on port 80. If you're just running a single server, you're ready to go. If you're running multiple servers, you need to put a load balancer in front of them.
 
-## Why not just run Capistrano, Kubernetes or Docker Swarm?
+## Why not just run Capistrano or Kubernetes?
 
 MRSK basically is Capistrano for Containers, which allow us to use vanilla servers as the hosts. No need to ensure that the servers have just the right version of Ruby or other dependencies you need. That all lives in the Docker image now. You can boot a brand new Ubuntu (or whatever) server, add it to the deploy servers of MRSK, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also allows for quicker deployments with less mucking about on the server. And the images built for MRSK can be used for CI or later introspection.
 
-Kubernetes is a beast. Running it yourself on your own hardware is not for the faint of heart. It's a fine option if you want to run on someone else's platform, either transparently [like Render](https://thenewstack.io/render-cloud-deployment-with-less-engineering/) or explicitly on AWS/GCP, but if you'd like the freedom to move between cloud and your own hardware, or even mix the two, MRSK is much simpler. You can see everything that's going on, it's just basic Docker commands being called.
+Kubernetes is a beast. Running it yourself on your own hardware is not for the faint of heart. It's a fine option if you want to run on someone else's platform, like Render or Fly, but if you'd like the freedom to move between cloud and your own hardware, or even mix the two, MRSK is much simpler. You can see everything that's going on, it's just basic Docker commands being called.
-
-Docker Swarm is much simpler than Kubernetes, but it's still built on the same declarative model that uses state reconciliation. MRSK is intentionally designed to around imperative commands, like Capistrano.
 
 ## Configuration
 
@@ -249,15 +247,14 @@ builder:
 
 This build secret can then be referenced in the Dockerfile:
 
-```dockerfile
+```
 # Copy Gemfiles
 COPY Gemfile Gemfile.lock ./
 
-# Install dependencies, including private repositories via access token (then remove bundle cache with exposed GITHUB_TOKEN)
+# Install dependencies, including private repositories via access token
 RUN --mount=type=secret,id=GITHUB_TOKEN \
   BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
-  bundle install && \
+  bundle install
-  rm -rf /usr/local/bundle/cache
 ```
 
 ### Using command arguments for Traefik
@@ -266,13 +263,12 @@ You can customize the traefik command line:
 
 ```yaml
 traefik:
-  args:
   accesslog: true
   accesslog.format: json
+  metrics.prometheus: true
+  metrics.prometheus.buckets: 0.1,0.3,1.2,5.0
 ```
 
-This will start the traefik container with `--accesslog=true accesslog.format=json`.
-
 ### Configuring build args for new images
 
 Build arguments that aren't secret can also be configured:

lib/mrsk/cli/main.rb

@@ -107,14 +107,10 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
   def envify
     if destination = options[:destination]
-      env_template_path = ".env.#{destination}.erb"
+      File.write(".env.#{destination}", ERB.new(IO.read(Pathname.new(File.expand_path(".env.#{destination}.erb")))).result)
-      env_path          = ".env.#{destination}"
     else
-      env_template_path = ".env.erb"
+      File.write(".env", ERB.new(IO.read(Pathname.new(File.expand_path(".env.erb")))).result)
-      env_path          = ".env"
     end
-
-    File.write(env_path, ERB.new(File.read(env_template_path)).result, perm: 0600)
   end
 
   desc "remove", "Remove Traefik, app, and registry session from servers"

lib/mrsk/commander.rb

@@ -75,14 +75,10 @@ class Mrsk::Commander
 
 
   def with_verbosity(level)
-    old_level = self.verbosity
+    old_level = SSHKit.config.output_verbosity
-
-    self.verbosity = level
     SSHKit.config.output_verbosity = level
-
     yield
   ensure
-    self.verbosity = old_level
     SSHKit.config.output_verbosity = old_level
   end
 
@@ -95,15 +91,7 @@ class Mrsk::Commander
 
   private
     def cascading_version
-      version.presence || ENV["VERSION"] || current_commit_hash
+      version.presence || ENV["VERSION"] || `git rev-parse HEAD`.strip
-    end
-
-    def current_commit_hash
-      if system("git rev-parse")
-        `git rev-parse HEAD`.strip
-      else
-        raise "Can't use commit hash as version, no git repository found in #{Dir.pwd}"
-      end
     end
 
     # Lazy setup of SSHKit

lib/mrsk/commands/accessory.rb

@@ -12,7 +12,6 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
       "--name", service_name,
       "-d",
       "--restart", "unless-stopped",
-      "--log-opt", "max-size=#{MAX_LOG_SIZE}",
       "-p", port,
       *env_args,
       *volume_args,

lib/mrsk/commands/app.rb

@@ -5,7 +5,6 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
     docker :run,
       "-d",
       "--restart unless-stopped",
-      "--log-opt", "max-size=#{MAX_LOG_SIZE}",
       "--name", service_with_version,
       *role.env_args,
       *config.volume_args,

lib/mrsk/commands/base.rb

@@ -2,8 +2,6 @@ module Mrsk::Commands
   class Base
     delegate :redact, to: Mrsk::Utils
 
-    MAX_LOG_SIZE = "10m"
-
     attr_accessor :config
 
     def initialize(config)

lib/mrsk/commands/builder/base.rb

@@ -13,10 +13,6 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
     argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
   end
 
-  def build_tags
-    [ "-t", config.absolute_image, "-t", config.latest_image ]
-  end
-
   private
     def args
       (config.builder && config.builder["args"]) || {}

lib/mrsk/commands/builder/multiarch.rb

@@ -12,7 +12,7 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
       "--push",
       "--platform", "linux/amd64,linux/arm64",
       "--builder", builder_name,
-      *build_tags, 
+      "-t", config.absolute_image,
       *build_args,
       *build_secrets,
       "."

lib/mrsk/commands/builder/native.rb

@@ -9,7 +9,7 @@ class Mrsk::Commands::Builder::Native < Mrsk::Commands::Builder::Base
 
   def push
     combine \
-      docker(:build, *build_tags, *build_args, *build_secrets, "."),
+      docker(:build, "-t", *build_args, *build_secrets, config.absolute_image, "."),
       docker(:push, config.absolute_image)
   end
 

lib/mrsk/commands/builder/native/remote.rb

@@ -16,7 +16,7 @@ class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
       "--push",
       "--platform", platform,
       "--builder", builder_name,
-      *build_tags,
+      "-t", config.absolute_image,
       *build_args,
       *build_secrets,
       "."

lib/mrsk/commands/prune.rb

@@ -2,7 +2,7 @@ require "active_support/duration"
 require "active_support/core_ext/numeric/time"
 
 class Mrsk::Commands::Prune < Mrsk::Commands::Base
-  PRUNE_IMAGES_AFTER     = 7.days.in_hours.to_i
+  PRUNE_IMAGES_AFTER     = 30.days.in_hours.to_i
   PRUNE_CONTAINERS_AFTER =  3.days.in_hours.to_i
 
   def images

lib/mrsk/commands/traefik.rb

@@ -2,8 +2,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
   def run
     docker :run, "--name traefik",
       "-d",
-      "--restart", "unless-stopped",
+      "--restart unless-stopped",
-      "--log-opt", "max-size=#{MAX_LOG_SIZE}",
       "-p 80:80",
       "-v /var/run/docker.sock:/var/run/docker.sock",
       "traefik",

lib/mrsk/configuration.rb

@@ -82,10 +82,6 @@ class Mrsk::Configuration
     "#{repository}:#{version}"
   end
 
-  def latest_image
-    "#{repository}:latest"
-  end
-
   def service_with_version
     "#{service}-#{version}"
   end

lib/mrsk/version.rb

@@ -1,3 +1,3 @@
 module Mrsk
-  VERSION = "0.6.3"
+  VERSION = "0.6.1"
 end

mrsk.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors     = [ "David Heinemeier Hansson" ]
   spec.email       = "dhh@hey.com"
   spec.homepage    = "https://github.com/rails/mrsk"
-  spec.summary     = "Deploy web apps in containers to servers running Docker with zero downtime."
+  spec.summary     = "Deploy Rails apps in containers to servers running Docker with zero downtime."
   spec.license     = "MIT"
 
   spec.files = Dir["lib/**/*", "MIT-LICENSE", "README.md"]

test/cli/accessory_test.rb

@@ -14,7 +14,7 @@ class CliAccessoryTest < CliTestCase
   end
 
   test "boot" do
-    assert_match "Running docker run --name app-mysql -d --restart unless-stopped --log-opt max-size=10m -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", run_command("boot", "mysql")
+    assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", run_command("boot", "mysql")
   end
 
   test "exec" do

test/commander_test.rb

@@ -9,16 +9,6 @@ class CommanderTest < ActiveSupport::TestCase
     assert_equal Mrsk::Configuration, @mrsk.config.class
   end
 
-  test "commit hash as version" do
-    assert_equal `git rev-parse HEAD`.strip, @mrsk.config.version
-  end
-
-  test "commit hash as version but not in git" do
-    @mrsk.expects(:system).with("git rev-parse").returns(nil)
-    error = assert_raises(RuntimeError) { @mrsk.config }
-    assert_match /no git repository found/, error.message
-  end
-
   test "overwriting hosts" do
     assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4" ], @mrsk.hosts
 

test/commands/accessory_test.rb

@@ -49,43 +49,35 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --name app-mysql -d --restart unless-stopped --log-opt max-size=10m -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret123 -e MYSQL_ROOT_HOST=% --label service=app-mysql mysql:8.0",
+      [:docker, :run, "--name", "app-mysql", "-d", "--restart", "unless-stopped", "-p", "3306:3306", "-e", "MYSQL_ROOT_PASSWORD=secret123", "-e", "MYSQL_ROOT_HOST=%", "--label", "service=app-mysql", "mysql:8.0"], @mysql.run
-      @mysql.run.join(" ")
 
     assert_equal \
-      "docker run --name app-redis -d --restart unless-stopped --log-opt max-size=10m -p 6379:6379 -e SOMETHING=else --volume /var/lib/redis:/data --label service=app-redis --label cache=true redis:latest",
+      [:docker, :run, "--name", "app-redis", "-d", "--restart", "unless-stopped", "-p", "6379:6379", "-e", "SOMETHING=else", "--volume", "/var/lib/redis:/data", "--label", "service=app-redis", "--label", "cache=true", "redis:latest"], @redis.run
-      @redis.run.join(" ")
   end
 
   test "start" do
-    assert_equal \
+    assert_equal [:docker, :container, :start, "app-mysql"], @mysql.start
-      "docker container start app-mysql",
-      @mysql.start.join(" ")
   end
 
   test "stop" do
-    assert_equal \
+    assert_equal [:docker, :container, :stop, "app-mysql"], @mysql.stop
-      "docker container stop app-mysql",
-      @mysql.stop.join(" ")
   end
 
   test "info" do
-    assert_equal \
+    assert_equal [:docker, :ps, "--filter", "label=service=app-mysql"], @mysql.info
-      "docker ps --filter label=service=app-mysql",
-      @mysql.info.join(" ")
   end
 
 
   test "execute in new container" do
     assert_equal \
-      "docker run --rm -e MYSQL_ROOT_PASSWORD=secret123 -e MYSQL_ROOT_HOST=% mysql:8.0 mysql -u root",
+      [ :docker, :run, "--rm", "-e", "MYSQL_ROOT_PASSWORD=secret123", "-e", "MYSQL_ROOT_HOST=%", "mysql:8.0", "mysql", "-u", "root" ],
-      @mysql.execute_in_new_container("mysql", "-u", "root").join(" ")
+      @mysql.execute_in_new_container("mysql", "-u", "root")
   end
 
   test "execute in existing container" do
     assert_equal \
-      "docker exec app-mysql mysql -u root",
+      [ :docker, :exec, "app-mysql", "mysql", "-u", "root" ],
-      @mysql.execute_in_existing_container("mysql", "-u", "root").join(" ")
+      @mysql.execute_in_existing_container("mysql", "-u", "root")
   end
 
   test "execute in new container over ssh" do
@@ -105,30 +97,19 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
 
 
   test "logs" do
-    assert_equal \
+    assert_equal [:docker, :logs, "app-mysql", "-t", "2>&1"], @mysql.logs
-      "docker logs app-mysql -t 2>&1",
+    assert_equal [:docker, :logs, "app-mysql", " --since 5m", " -n 100", "-t", "2>&1", "|", "grep 'thing'"], @mysql.logs(since: "5m", lines: 100, grep: "thing")
-      @mysql.logs.join(" ")
-
-    assert_equal \
-      "docker logs app-mysql  --since 5m  -n 100 -t 2>&1 | grep 'thing'",
-      @mysql.logs(since: "5m", lines: 100, grep: "thing").join(" ")
   end
 
   test "follow logs" do
-    assert_equal \
+    assert_equal "ssh -t root@1.1.1.5 'docker logs app-mysql -t -n 10 -f 2>&1'", @mysql.follow_logs
-      "ssh -t root@1.1.1.5 'docker logs app-mysql -t -n 10 -f 2>&1'",
-      @mysql.follow_logs
   end
 
   test "remove container" do
-    assert_equal \
+    assert_equal [:docker, :container, :prune, "-f", "--filter", "label=service=app-mysql"], @mysql.remove_container
-      "docker container prune -f --filter label=service=app-mysql",
-      @mysql.remove_container.join(" ")
   end
 
   test "remove image" do
-    assert_equal \
+    assert_equal [:docker, :image, :prune, "-a", "-f", "--filter", "label=service=app-mysql"], @mysql.remove_image
-      "docker image prune -a -f --filter label=service=app-mysql",
-      @mysql.remove_image.join(" ")
   end
 end

test/commands/app_test.rb

@@ -14,7 +14,7 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run -d --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=456 --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999",
+      "docker run -d --restart unless-stopped --name app-999 -e RAILS_MASTER_KEY=456 --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999",
       @app.run.join(" ")
   end
 
@@ -22,7 +22,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:volumes] = ["/local/path:/container/path" ]
 
     assert_equal \
-      "docker run -d --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=456 --volume /local/path:/container/path --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999",
+      "docker run -d --restart unless-stopped --name app-999 -e RAILS_MASTER_KEY=456 --volume /local/path:/container/path --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999",
       @app.run.join(" ")
   end
 

test/commands/builder_test.rb

@@ -8,25 +8,25 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   test "target multiarch by default" do
     builder = new_builder_command
     assert_equal "multiarch", builder.name
-    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch", "-t", "dhh/app:123", "-t", "dhh/app:latest", "."], builder.push
+    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch", "-t", "dhh/app:123", "."], builder.push
   end
 
   test "target native when multiarch is off" do
     builder = new_builder_command(builder: { "multiarch" => false })
     assert_equal "native", builder.name
-    assert_equal [:docker, :build, "-t", "dhh/app:123", "-t", "dhh/app:latest", ".", "&&", :docker, :push, "dhh/app:123"], builder.push
+    assert_equal [:docker, :build, "-t", "dhh/app:123", ".", "&&", :docker, :push, "dhh/app:123"], builder.push
   end
 
   test "target multiarch remote when local and remote is set" do
     builder = new_builder_command(builder: { "local" => { }, "remote" => { } })
     assert_equal "multiarch/remote", builder.name
-    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch-remote", "-t", "dhh/app:123", "-t", "dhh/app:latest", "."], builder.push
+    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch-remote", "-t", "dhh/app:123", "."], builder.push
   end
 
   test "target native remote when only remote is set" do
     builder = new_builder_command(builder: { "remote" => { "arch" => "amd64" } })
     assert_equal "native/remote", builder.name
-    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64", "--builder", "mrsk-app-native-remote", "-t", "dhh/app:123", "-t", "dhh/app:latest", "."], builder.push
+    assert_equal [:docker, :buildx, :build, "--push", "--platform", "linux/amd64", "--builder", "mrsk-app-native-remote", "-t", "dhh/app:123", "."], builder.push
   end
 
   test "build args" do
@@ -41,17 +41,17 @@ class CommandsBuilderTest < ActiveSupport::TestCase
 
   test "native push with build args" do
     builder = new_builder_command(builder: { "multiarch" => false, "args" => { "a" => 1, "b" => 2 } })
-    assert_equal [ :docker, :build, "-t", "dhh/app:123", "-t", "dhh/app:latest", "--build-arg", "a=1", "--build-arg", "b=2", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push
+    assert_equal [ :docker, :build, "-t", "--build-arg", "a=1", "--build-arg", "b=2", "dhh/app:123", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push
   end
 
   test "multiarch push with build args" do
     builder = new_builder_command(builder: { "args" => { "a" => 1, "b" => 2 } })
-    assert_equal [ :docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch", "-t", "dhh/app:123", "-t", "dhh/app:latest", "--build-arg", "a=1", "--build-arg", "b=2", "." ], builder.push
+    assert_equal [ :docker, :buildx, :build, "--push", "--platform", "linux/amd64,linux/arm64", "--builder", "mrsk-app-multiarch", "-t", "dhh/app:123", "--build-arg", "a=1", "--build-arg", "b=2", "." ], builder.push
   end
 
   test "native push with with build secrets" do
     builder = new_builder_command(builder: { "multiarch" => false, "secrets" => [ "a", "b" ] })
-    assert_equal [ :docker, :build, "-t", "dhh/app:123", "-t", "dhh/app:latest", "--secret", "id=a", "--secret", "id=b", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push
+    assert_equal [ :docker, :build, "-t", "--secret", "id=a", "--secret", "id=b", "dhh/app:123", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push
   end
 
   private

test/commands/traefik_test.rb

@@ -10,74 +10,63 @@ class CommandsTraefikTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --name traefik -d --restart unless-stopped --log-opt max-size=10m -p 80:80 -v /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",
+      [:docker, :run, "--name traefik", "-d", "--restart unless-stopped", "-p 80:80", "-v /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(" ")
+      new_command.run
   end
 
   test "traefik start" do
     assert_equal \
-      "docker container start traefik",
+      [:docker, :container, :start, 'traefik'], new_command.start
-      new_command.start.join(" ")
   end
 
   test "traefik stop" do
     assert_equal \
-      "docker container stop traefik",
+      [:docker, :container, :stop, 'traefik'], new_command.stop
-      new_command.stop.join(" ")
   end
 
   test "traefik info" do
     assert_equal \
-      "docker ps --filter name=traefik",
+      [:docker, :ps, '--filter', 'name=traefik'], new_command.info
-      new_command.info.join(" ")
   end
 
   test "traefik logs" do
     assert_equal \
-      "docker logs traefik -t 2>&1",
+      [:docker, :logs, 'traefik', '-t', '2>&1'], new_command.logs
-      new_command.logs.join(" ")
   end
 
   test "traefik logs since 2h" do
     assert_equal \
-      "docker logs traefik  --since 2h -t 2>&1",
+      [:docker, :logs, 'traefik', ' --since 2h', '-t', '2>&1'], new_command.logs(since: '2h')
-      new_command.logs(since: '2h').join(" ")
   end
 
   test "traefik logs last 10 lines" do
     assert_equal \
-      "docker logs traefik  -n 10 -t 2>&1",
+      [:docker, :logs, 'traefik', ' -n 10', '-t', '2>&1'], new_command.logs(lines: 10)
-      new_command.logs(lines: 10).join(" ")
   end
 
   test "traefik logs with grep hello!" do
     assert_equal \
-      "docker logs traefik -t 2>&1 | grep 'hello!'",
+      [:docker, :logs, 'traefik', '-t', '2>&1', "|", "grep 'hello!'"], new_command.logs(grep: 'hello!')
-      new_command.logs(grep: 'hello!').join(" ")
   end
 
   test "traefik remove container" do
     assert_equal \
-      "docker container prune -f --filter label=org.opencontainers.image.title=Traefik",
+      [:docker, :container, :prune, "-f", "--filter", "label=org.opencontainers.image.title=Traefik"], new_command.remove_container
-      new_command.remove_container.join(" ")
   end
 
   test "traefik remove image" do
     assert_equal \
-      "docker image prune -a -f --filter label=org.opencontainers.image.title=Traefik",
+    [:docker, :image, :prune, "-a", "-f", "--filter", "label=org.opencontainers.image.title=Traefik"], new_command.remove_image
-      new_command.remove_image.join(" ")
   end
 
   test "traefik follow logs" do
     assert_equal \
-      "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1'",
+    "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1'", new_command.follow_logs(host: @config[:servers].first)
-      new_command.follow_logs(host: @config[:servers].first)
   end
 
   test "traefik follow logs with grep hello!" do
     assert_equal \
-      "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1 | grep \"hello!\"'",
+    "ssh -t root@1.1.1.1 'docker logs traefik -t -n 10 -f 2>&1 | grep \"hello!\"'", new_command.follow_logs(host: @config[:servers].first, grep: 'hello!')
-      new_command.follow_logs(host: @config[:servers].first, grep: 'hello!')
   end
 
   private