Bump version for 0.6.1

Fix issue with removing containers triggering twice, then ensure app stop runs closer to app run on each host
2023-02-07 15:05:52 +01:00 · 2023-02-07 15:05:06 +01:00
158 changed files with 2001 additions and 7444 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,5 @@
 name: CI
-on: 
+on: [push, pull_request]
  push:
    branches:
      - main
  pull_request:
 jobs:
  tests:
    strategy:
@@ -12,15 +8,12 @@ jobs:
          - "2.7"
          - "3.1"
          - "3.2"
        gemfile:
          - Gemfile
          - gemfiles/rails_edge.gemfile
        continue-on-error: [false]
    name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
    runs-on: ubuntu-latest
    continue-on-error: ${{ matrix.continue-on-error }}
-    env:
+
      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
    steps:
      - uses: actions/checkout@v2
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,41 +0,0 @@
 name: Docker
 on:
  release:
    types: [created]
    tags:
      - 'v*'
 jobs:
  build-and-push-image:
    runs-on: ubuntu-latest
    permissions:
      contents: read
      packages: write
    steps:
      -
        name: Checkout
        uses: actions/checkout@v3
      -
        name: Set up QEMU
        uses: docker/setup-qemu-action@v2
      -
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
      -
        name: Login to GitHub Container Registry
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      -
        name: Build and push
        uses: docker/build-push-action@v3
        with:
          context: .
          platforms: linux/amd64,linux/arm64
          push: true
          tags: |
            ghcr.io/mrsked/mrsk:latest
            ghcr.io/mrsked/mrsk:${{ github.ref_name }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .byebug_history
 *.gem
 coverage/*
-.DS_Store
+.DS_Store
 gemfiles/*.lock
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,41 +0,0 @@
 # Contributor Code of Conduct
 As contributors and maintainers of the Kamal project, we pledge to create a welcoming and inclusive environment for everyone. We value the participation of each member of our community and want all contributors to feel respected and valued.
 We are committed to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age, or religion (or lack thereof). We do not tolerate harassment of participants in any form.
 This code of conduct applies to all Kamal project spaces, including but not limited to project code, issue trackers, chat rooms, and mailing lists. Violations of this code of conduct may result in removal from the project community.
 ## Our standards
 Examples of behavior that contributes to creating a positive environment include:
 - Using welcoming and inclusive language
 - Being respectful of differing viewpoints and experiences
 - Gracefully accepting constructive criticism
 - Focusing on what is best for the community
 - Showing empathy towards other community members
 Examples of unacceptable behavior by participants include:
 - The use of sexualized language or imagery and unwelcome sexual attention or advances
 - Trolling, insulting/derogatory comments, and personal or political attacks
 - Public or private harassment
 - Publishing others' private information, such as a physical or electronic address, without explicit permission
 - Other conduct which could reasonably be considered inappropriate in a professional setting
 ## Responsibilities
 Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
 Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 ## Reporting
 If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a project maintainer. All reports will be kept confidential and will be reviewed and investigated promptly.
 We will investigate every complaint and take appropriate action. We reserve the right to remove any content that violates this Code of Conduct, or to temporarily or permanently ban any contributor for other behaviors that we deem inappropriate, threatening, offensive, or harmful.
 ## Attribution
 This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,49 +0,0 @@
 # Contributing to Kamal development
 Thank you for considering contributing to Kamal! This document outlines some guidelines for contributing to this open source project.
 Please make sure to review our [Code of Conduct](CODE_OF_CONDUCT.md) before contributing to Kamal.
 There are several ways you can contribute to the betterment of the project:
 - **Report an issue?** - If the issue isn’t reported, we can’t fix it. Please report any bugs, feature, and/or improvement requests on the [Kamal GitHub Issues tracker](https://github.com/basecamp/kamal/issues).
 - **Submit patches** - Do you have a new feature or a fix you'd like to share? [Submit a pull request](https://github.com/basecamp/kamal/pulls)!
 - **Write blog articles** - Are you using Kamal? We'd love to hear how you're using it with your projects. Write a tutorial and post it on your blog!
 ## Issues
 If you encounter any issues with the project, please check the [existing issues](https://github.com/basecamp/kamal/issues) first to see if the issue has already been reported. If the issue hasn't been reported, please open a new issue with a clear description of the problem and steps to reproduce it.
 ## Pull Requests
 Please keep the following guidelines in mind when opening a pull request:
 - Ensure that your code passes the project's minitests by running ./bin/test.
 - Provide a clear and detailed description of your changes.
 - Keep your changes focused on a single concern.
 - Write clean and readable code that follows the project's code style.
 - Use descriptive variable and function names.
 - Write clear and concise commit messages.
 - Add tests for your changes, if possible.
 - Ensure that your changes don't break existing functionality.
 #### Commit message guidelines
 A good commit message should describe what changed and why.
 ## Development
 The `main` branch is regularly built and tested, but it is not guaranteed to be completely stable. Tags are created regularly from release branches to indicate new official, stable release versions of Kamal.
 Kamal is written in Ruby. You should have Ruby 3.2+ installed on your machine in order to work on Kamal. If that's already setup, run `bundle` in the root directory to install all dependencies. Then you can run `bin/test` to run all tests.
 1. Fork the project repository.
 2. Create a new branch for your contribution.
 3. Write your code or make the desired changes.
 4. **Ensure that your code passes the project's minitests by running ./bin/test.**
 5. Commit your changes and push them to your forked repository.
 6. [Open a pull request](https://github.com/basecamp/kamal/pulls) to the main project repository with a detailed description of your changes.
 ## License
 Kamal is released under the MIT License. By contributing to this project, you agree to license your contributions under the same license.
--- a/40
+++ b/40
@@ -1,40 +0,0 @@
 # Use the official Ruby 3.2.0 Alpine image as the base image
 FROM ruby:3.2.0-alpine
 # Install  docker/buildx-bin
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 # Set the working directory to /kamal
 WORKDIR /kamal
 # Copy the Gemfile, Gemfile.lock into the container
 COPY Gemfile Gemfile.lock kamal.gemspec ./
 # Required in kamal.gemspec
 COPY lib/kamal/version.rb /kamal/lib/kamal/version.rb
 # Install system dependencies
 RUN apk add --no-cache --update build-base git docker openrc openssh-client-default \
    && rc-update add docker boot \
    && gem install bundler --version=2.4.3 \
    && bundle install
 # Copy the rest of our application code into the container.
 # We do this after bundle install, to avoid having to run bundle
 # every time we do small fixes in the source code.
 COPY . .
 # Install the gem locally from the project folder
 RUN gem build kamal.gemspec && \
    gem install ./kamal-*.gem --no-document
 # Set the working directory to /workdir
 WORKDIR /workdir
 # Tell git it's safe to access /workdir/.git even if
 # the directory is owned by a different user
 RUN git config --global --add safe.directory /workdir
 # Set the entrypoint to run the installed binary in /workdir
 # Example:  docker run -it -v "$PWD:/workdir" kamal init
 ENTRYPOINT ["kamal"]
--- a/4
+++ b/4
@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 gem "debug"
 gem "mocha"
 gem "railties"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,9 @@
 PATH
  remote: .
  specs:
-    kamal (0.16.0)
+    mrsk (0.6.1)
      activesupport (>= 7.0)
      bcrypt_pbkdf (~> 1.0)
      concurrent-ruby (~> 1.2)
      dotenv (~> 2.8)
      ed25519 (~> 1.2)
      net-ssh (~> 7.0)
      sshkit (~> 1.21)
      thor (~> 1.2)
      zeitwerk (~> 2.5)
@@ -15,92 +11,94 @@ PATH
 GEM
  remote: https://rubygems.org/
  specs:
-    actionpack (7.0.4.3)
+    actionpack (7.0.4)
-      actionview (= 7.0.4.3)
+      actionview (= 7.0.4)
-      activesupport (= 7.0.4.3)
+      activesupport (= 7.0.4)
      rack (~> 2.0, >= 2.2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4.3)
+    actionview (7.0.4)
-      activesupport (= 7.0.4.3)
+      activesupport (= 7.0.4)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.3)
+    activesupport (7.0.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
    bcrypt_pbkdf (1.1.0)
    builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.1.10)
    crass (1.0.6)
-    debug (1.7.2)
+    debug (1.7.1)
      irb (>= 1.5.0)
      reline (>= 0.3.1)
    dotenv (2.8.1)
    ed25519 (1.3.0)
    erubi (1.12.0)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
    io-console (0.6.0)
-    irb (1.6.3)
+    irb (1.6.2)
      reline (>= 0.3.0)
-    loofah (2.20.0)
+    loofah (2.19.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    method_source (1.0.0)
-    minitest (5.18.0)
+    minitest (5.17.0)
    mocha (2.0.2)
      ruby2_keywords (>= 0.0.5)
    net-scp (4.0.0)
      net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.1.0)
+    net-ssh (7.0.1)
-    nokogiri (1.14.2-arm64-darwin)
+    nokogiri (1.14.0-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
      racc (~> 1.4)
    racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.5)
-    rack-test (2.1.0)
+    rack-test (2.0.2)
      rack (>= 1.3)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
+    rails-html-sanitizer (1.4.4)
      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
+    railties (7.0.4)
-      actionpack (= 7.0.4.3)
+      actionpack (= 7.0.4)
-      activesupport (= 7.0.4.3)
+      activesupport (= 7.0.4)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
      zeitwerk (~> 2.5)
    rake (13.0.6)
-    reline (0.3.3)
+    reline (0.3.2)
      io-console (~> 0.5)
    ruby2_keywords (0.0.5)
-    sshkit (1.21.4)
+    sshkit (1.21.3)
      net-scp (>= 1.1.2)
      net-ssh (>= 2.8.0)
    thor (1.2.1)
-    tzinfo (2.0.6)
+    tzinfo (2.0.5)
      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.6)
 PLATFORMS
-  arm64-darwin
+  arm64-darwin-20
-  x86_64-darwin
+  arm64-darwin-21
  arm64-darwin-22
  x86_64-darwin-20
  x86_64-darwin-21
  x86_64-darwin-22
  x86_64-linux
 DEPENDENCIES
  debug
  kamal!
  mocha
  mrsk!
  railties
 BUNDLED WITH
--- a/README.md
+++ b/README.md
@@ -1,28 +1,10 @@
-# Kamal
+# MRSK
-Kamal deploys web apps anywhere from bare metal to cloud VMs using Docker with zero downtime. It uses the dynamic reverse-proxy Traefik to hold requests while the new application container is started and the old one is stopped. It works seamlessly across multiple hosts, using SSHKit to execute commands. It was built for Rails applications, but works with any type of web app that can be containerized with Docker.
+MRSK deploys web apps in containers to servers running Docker with zero downtime. It uses the dynamic reverse-proxy Traefik to hold requests while the new application container is started and the old one is stopped. It works seamlessly across multiple hosts, using SSHKit to execute commands.
 Watch the screencast: https://www.youtube.com/watch?v=LL1cV2FXZ5I
 Join us on Discord: https://discord.gg/YgHVT7GCXS
 Ask questions: https://github.com/basecamp/kamal/discussions
 ## Installation
-If you have a Ruby environment available, you can install Kamal globally with:
+Install MRSK globally with `gem install mrsk`. Then, inside your app directory, run `mrsk init` (or `mrsk init --bundle` within Rails apps where you want a bin/mrsk binstub). Now edit the new file `config/deploy.yml`. It could look as simple as this:
 ```sh
 gem install kamal
 ```
 ...otherwise, you can run a dockerized version via an alias (add this to your .bashrc or similar to simplify re-use):
 ```sh
 alias kamal='docker run --rm -it -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir  ghcr.io/basecamp/kamal'
 ```
 Then, inside your app directory, run `kamal init` (or `kamal init --bundle` within Rails 7+ apps where you want a bin/kamal binstub). Now edit the new file `config/deploy.yml`. It could look as simple as this:
 ```yaml
 service: hey
@@ -32,163 +14,52 @@ servers:
  - 192.168.0.2
 registry:
  username: registry-user-name
-  password:
+  password: <%= ENV.fetch("MRSK_REGISTRY_PASSWORD") %>
    - KAMAL_REGISTRY_PASSWORD
 env:
  secret:
    - RAILS_MASTER_KEY
 ```
-Then edit your `.env` file to add your registry password as `KAMAL_REGISTRY_PASSWORD` (and your `RAILS_MASTER_KEY` for production with a Rails app).
+Then edit your `.env` file to add your registry password as `MRSK_REGISTRY_PASSWORD` (and your `RAILS_MASTER_KEY` for production with a Rails app).
 Now you're ready to deploy to the servers:
 ```
-kamal setup
+mrsk deploy
 ```
 This will:
-1. Connect to the servers over SSH (using root by default, authenticated by your ssh key)
+1. Connect to the servers over SSH (using root by default, authenticated by your loaded ssh key)
-2. Install Docker and curl on any server that might be missing it (using apt-get): root access is needed via ssh for this.
+2. Install Docker on any server that might be missing it (using apt-get)
 3. Log into the registry both locally and remotely
 4. Build the image using the standard Dockerfile in the root of the application.
 5. Push the image to the registry.
-6. Pull the image from the registry onto the servers.
+6. Pull the image from the registry on the servers.
 7. Ensure Traefik is running and accepting traffic on port 80.
-8. Ensure your app responds with `200 OK` to `GET /up` (you must have curl installed inside your app image!).
+8. Stop any containers running a previous versions of the app.
 9. Start a new container with the version of the app that matches the current git version hash.
-10. Stop the old container running the previous version of the app.
+10. Prune unused images and stopped containers to ensure servers don't fill up.
 11. Prune unused images and stopped containers to ensure servers don't fill up.
-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. For subsequent deploys, or if your servers already have Docker and curl installed, you can just run `kamal deploy`.
+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.
-### Rails <7 usage
+## Why not just run Capistrano or Kubernetes?
-Kamal is not needed to be in your application Gemfile to be used. However, if you want to guarantee specific Kamal version in your CI/CD workflows, you can create a separate Gemfile for Kamal, for example, `gemfile/kamal.gemfile`:
+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.
-```ruby
+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.
 source 'https://rubygems.org'
 gem 'kamal', '~> 0.14'
 ```
 Bundle with `BUNDLE_GEMFILE=gemfiles/kamal.gemfile bundle`.
 After this Kamal can be used for deployment:
 ```sh
 BUNDLE_GEMFILE=gemfiles/kamal.gemfile bundle exec kamal deploy
 ```
 ## Vision
 In the past decade+, there's been an explosion in commercial offerings that make deploying web apps easier. Heroku kicked it off with an incredible offering that stayed ahead of the competition seemingly forever. These days we have excellent alternatives like Fly.io and Render. And hosted Kubernetes is making things easier too on AWS, GCP, Digital Ocean, and elsewhere. But these are all offerings that have you renting computers in the cloud at a premium. If you want to run on your own hardware, or even just have a clear migration path to do so in the future, you need to carefully consider how locked in you get to these commercial platforms. Preferably before the bills swallow your business whole!
 Kamal seeks to bring the advance in ergonomics pioneered by these commercial offerings to deploying web apps anywhere. Whether that's low-cost cloud options without the managed-service markup from the likes of Digital Ocean, Hetzner, OVH, etc., or it's your own colocated bare metal. To Kamal, it's all the same. Feed the config file a list of IP addresses with vanilla Ubuntu servers that have seen no prep beyond an added SSH key, and you'll be running in literally minutes.
 This approach gives you enormous portability. You can have your web app deployed on several clouds at ease like this. Or you can buy the baseline with your own hardware, then deploy to a cloud before a big seasonal spike to get more capacity. When you're not locked into a single provider from a tooling perspective, there are a lot of compelling options available.
 Ultimately, Kamal is meant to compress the complexity of going to production using open source tooling that isn't tied to any commercial offering. Not to zero, mind you. You're probably still better off with a fully managed service if basic Linux or Docker is still difficult, but as soon as those concepts are familiar, you'll be ready to go with Kamal.
 ## Why not just run Capistrano, Kubernetes or Docker Swarm?
 Kamal basically is Capistrano for Containers, without the need to carefully prepare servers in advance. 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 list of servers in Kamal, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also speeds up deployments with less mucking about on the server. And the images built for Kamal 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, Kamal 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. Kamal is intentionally designed around imperative commands, like Capistrano.
 Ultimately, there are a myriad of ways to deploy web apps, but this is the toolkit we're using at [37signals](https://37signals.com) to bring [HEY](https://www.hey.com) [home from the cloud](https://world.hey.com/dhh/why-we-re-leaving-the-cloud-654b47e0) without losing the advantages of modern containerization tooling.
 ## Running Kamal from Docker
 Kamal is packaged up in a Docker container similarly to [rails/docked](https://github.com/rails/docked). This will allow you to run Kamal (from your application directory) without having to install any dependencies other than Docker. Add the following alias to your profile configuration to make working with the container more convenient:
 ```bash
 alias kamal="docker run -it --rm -v '${PWD}:/workdir' -v '${SSH_AUTH_SOCK}:/ssh-agent' -v /var/run/docker.sock:/var/run/docker.sock -e 'SSH_AUTH_SOCK=/ssh-agent' ghcr.io/basecamp/kamal:latest"
 ```
 Since Kamal uses SSH to establish a remote connection, it will need access to your SSH agent. The above command uses a volume mount to make it available inside the container and configures the SSH agent inside the container to make use of it.
 ## Configuration
 ### Using .env file to load required environment variables
-Kamal uses [dotenv](https://github.com/bkeepers/dotenv) to automatically load environment variables set in the `.env` file present in the application root. This file can be used to set variables like `KAMAL_REGISTRY_PASSWORD` or database passwords. But for this reason you must ensure that .env files are not checked into Git or included in your Dockerfile! The format is just key-value like:
+MRSK uses [dotenv](https://github.com/bkeepers/dotenv) to automatically load environment variables set in the `.env` file present in the application root. This file can be used to set variables like `MRSK_REGISTRY_PASSWORD` or database passwords. But for this reason you must ensure that .env files are not checked into Git or included in your Dockerfile! The format is just key-value like:
 ```bash
-KAMAL_REGISTRY_PASSWORD=pw
+MRSK_REGISTRY_PASSWORD=pw
 DB_PASSWORD=secret123
 ```
 ### Using a generated .env file
 #### 1Password as a secret store
 If you're using a centralized secret store, like 1Password, you can create `.env.erb` as a template which looks up the secrets. Example of a .env.erb file:
 ```erb
 <% if (session_token = `op signin --account my-one-password-account --raw`.strip) != "" %># Generated by kamal envify
 GITHUB_TOKEN=<%= `gh config get -h github.com oauth_token`.strip %>
 KAMAL_REGISTRY_PASSWORD=<%= `op read "op://Vault/Docker Hub/password" -n --session  #{session_token}` %>
 RAILS_MASTER_KEY=<%= `op read "op://Vault/My App/RAILS_MASTER_SECRET" -n --session #{session_token}` %>
 MYSQL_ROOT_PASSWORD=<%= `op read "op://Vault/My App/MYSQL_ROOT_PASSWORD" -n --session #{session_token}` %>
 <% else raise ArgumentError, "Session token missing" end %>
 ```
 This template can safely be checked into git. Then everyone deploying the app can run `kamal envify` when they setup the app for the first time or passwords change to get the correct `.env` file.
 If you need separate env variables for different destinations, you can set them with `.env.destination.erb` for the template, which will generate `.env.staging` when run with `kamal envify -d staging`.
 Note: If you utilize biometrics with 1Password you can remove the `session_token` related parts in the example and just call `op read op://Vault/Docker Hub/password -n`.
 #### Bitwarden as a secret store
 If you are using open source secret store like bitwarden, you can create `.env.erb` as a template which looks up the secrets.
 You can store `SOME_SECRET` in a secure note in bitwarden vault.
 ```
 $ bw list items --search SOME_SECRET | jq
 ? Master password: [hidden]
 [
  {
    "object": "item",
    "id": "123123123-1232-4224-222f-234234234234",
    "organizationId": null,
    "folderId": null,
    "type": 2,
    "reprompt": 0,
    "name": "SOME_SECRET",
    "notes": "yyy",
    "favorite": false,
    "secureNote": {
      "type": 0
    },
    "collectionIds": [],
    "revisionDate": "2023-02-28T23:54:47.868Z",
    "creationDate": "2022-11-07T03:16:05.828Z",
    "deletedDate": null
  }
 ]
 ```
 and extract the `id` of `SOME_SECRET` from the `json` above and use in the `erb` below.
 Example `.env.erb` file:
 ```erb
 <% if (session_token=`bw unlock --raw`.strip) != "" %># Generated by kamal envify
 SOME_SECRET=<%= `bw get notes 123123123-1232-4224-222f-234234234234 --session #{session_token}` %>
 <% else raise ArgumentError, "session_token token missing" end %>
 ```
 Then everyone deploying the app can run `kamal envify` and kamal will generate `.env`
 ### Using another registry than Docker Hub
 The default registry is Docker Hub, but you can change it using `registry/server`:
@@ -196,27 +67,10 @@ The default registry is Docker Hub, but you can change it using `registry/server
 ```yaml
 registry:
  server: registry.digitalocean.com
-  username:
+  username: registry-user-name
-    - DOCKER_REGISTRY_TOKEN
+  password: <%= ENV.fetch("MRSK_REGISTRY_PASSWORD") %>
  password:
    - DOCKER_REGISTRY_TOKEN
 ```
 A reference to secret `DOCKER_REGISTRY_TOKEN` will look for `ENV["DOCKER_REGISTRY_TOKEN"]` on the machine running Kamal.
 #### Using AWS ECR as the container registry
 AWS ECR's access token is only valid for 12hrs. In order to not have to manually regenerate the token every time, you can use ERB in the `deploy.yml` file to shell out to the `aws` cli command, and obtain the token:
 ```yaml
 registry:
  server: <your aws account id>.dkr.ecr.<your aws region id>.amazonaws.com
  username: AWS
  password: <%= %x(aws ecr get-login-password) %>
 ```
 You will need to have the `aws` CLI installed locally for this to work.
 ### Using a different SSH user than root
 The default SSH user is root, but you can change it using `ssh/user`:
@@ -226,15 +80,6 @@ ssh:
  user: app
 ```
 If you are using non-root user (`app` as above example), you need to bootstrap your servers manually, before using them with Kamal. On Ubuntu, you'd do:
 ```bash
 sudo apt update
 sudo apt upgrade -y
 sudo apt install -y docker.io curl git
 sudo usermod -a -G docker app
 ```
 ### Using a proxy SSH host
 If you need to connect to server through a proxy host, you can use `ssh/proxy`:
@@ -251,21 +96,6 @@ ssh:
  proxy: "app@192.168.0.1"
 ```
 Also if you need specific proxy command to connect to the server:
 ```yaml
 ssh:
  proxy_command: aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --region=us-east-1 ## ssh via aws ssm
 ```
 ### Configuring the SSH log level
 ```yaml
 ssh:
  log_level: debug
 ```
 Valid levels are `debug`, `info`, `warn`, `error` and `fatal` (default).
 ### Using env variables
 You can inject env variables into the app containers using `env`:
@@ -290,11 +120,11 @@ env:
    - REDIS_PASSWORD
 ```
-The list of secret env variables will be expanded at run time from your local machine. So a reference to a secret `DATABASE_PASSWORD` will look for `ENV["DATABASE_PASSWORD"]` on the machine running Kamal. Just like with build secrets.
+The list of secret env variables will be expanded at run time from your local machine. So a reference to a secret `DATABASE_PASSWORD` will look for `ENV["DATABASE_PASSWORD"]` on the machine running MRSK. Just like with build secrets.
 If the referenced secret ENVs are missing, the configuration will be halted with a `KeyError` exception.
-Note: Marking an ENV as secret currently only redacts its value in the output for Kamal. The ENV is still injected in the clear into the container at runtime.
+Note: Marking an ENV as secret currently only redacts its value in the output for MRSK. The ENV is still injected in the clear into the container at runtime.
 ### Using volumes
@@ -305,12 +135,6 @@ volumes:
  - "/local/path:/container/path"
 ```
 ### Kamal env variables
 The following env variables are set when your container runs:
 `KAMAL_CONTAINER_NAME` : this contains the current container name and version
 ### Using different roles for servers
 If your application uses separate hosts for running jobs or other roles beyond the default web running, you can specify these hosts in a dedicated role with a new entrypoint command like so:
@@ -345,13 +169,12 @@ servers:
 You can specialize the default Traefik rules by setting labels on the containers that are being started:
 ```yaml
 labels:
  traefik.http.routers.hey-web.rule: Host(`app.hey.com`)
 ```
-Traefik rules are in the "service-role-destination" format. The default role will be `web` if no rule is specified. If the destination is not specified, it is not included. To give an example, the above rule would become "traefik.http.routers.hey-web-staging.rule" if it was for the "staging" destination.
+labels:
  traefik.http.routers.hey.rule: '''Host(`app.hey.com`)'''
 ```
-Note: The backticks are needed to ensure the rule is passed in correctly and not treated as command substitution by Bash!
+Note: The extra quotes are needed to ensure the rule is passed in correctly!
 This allows you to run multiple applications on the same server sharing the same Traefik instance and port.
 See https://doc.traefik.io/traefik/routing/routers/#rule for a full list of available routing rules.
@@ -372,78 +195,9 @@ servers:
      my-label: "50"
 ```
 ### Using shell expansion
 You can use shell expansion to interpolate values from the host machine into labels and env variables with the `${}` syntax.
 Anything within the curly braces will be executed on the host machine and the result will be interpolated into the label or env variable.
 ```yaml
 labels:
  host-machine: "${cat /etc/hostname}"
 env:
  HOST_DEPLOYMENT_DIR: "${PWD}"
 ```
 Note: Any other occurrence of `$` will be escaped to prevent unwanted shell expansion!
 ### Using container options
 You can specialize the options used to start containers using the `options` definitions:
 ```yaml
 servers:
  web:
    - 192.168.0.1
    - 192.168.0.2
  job:
    hosts:
      - 192.168.0.3
      - 192.168.0.4
    cmd: bin/jobs
    options:
      cap-add: true
      cpu-count: 4
 ```
 That'll start the job containers with `docker run ... --cap-add --cpu-count 4 ...`.
 ### Setting a minimum version
 You can set the minimum Kamal version with:
 ```yaml
 minimum_version: 0.13.3
 ```
 Note: versions <= 0.13.2 will ignore this setting.
 ### Configuring logging
 You can configure the logging driver and options passed to Docker using `logging`:
 ```yaml
 logging:
  driver: awslogs
  options:
    awslogs-region: "eu-central-2"
    awslogs-group: "my-app"
 ```
 If nothing is configured, the default option `max-size=10m` is used for all containers. The default logging driver of Docker is `json-file`.
 ### Using a different stop wait time
 On a new deploy, each old running container is gracefully shut down with a `SIGTERM`, and after a grace period of `10` seconds a `SIGKILL` is sent.
 You can configure this value via the `stop_wait_time` option:
 ```yaml
 stop_wait_time: 30
 ```
 ### Using remote builder for native multi-arch
-If you're developing on ARM64 (like Apple Silicon), but you want to deploy on AMD64 (x86 64-bit), you can use multi-architecture images. By default, Kamal will setup a local buildx configuration that does this through QEMU emulation. But this can be quite slow, especially on the first build.
+If you're developing on ARM64 (like Apple Silicon), but you want to deploy on AMD64 (x86 64-bit), you can use multi-archecture images. By default, MRSK will setup a local buildx configuration that does this through QEMU emulation. But this can be quite slow, especially on the first build.
 If you want to speed up this process by using a remote AMD64 host to natively build the AMD64 part of the image, while natively building the ARM64 part locally, you can do so using builder options:
@@ -479,62 +233,11 @@ builder:
  multiarch: false
 ```
-This is also a good option if you're running Kamal from a CI server that shares architecture with the deployment servers.
+This is also a good option if you're running MRSK from a CI server that shares architecture with the deployment servers.
 ### Using a different Dockerfile or context when building
 If you need to pass a different Dockerfile or context to the build command (e.g. if you're using a monorepo or you have
 different Dockerfiles), you can do so in the builder options:
 ```yaml
 # Use a different Dockerfile
 builder:
  dockerfile: Dockerfile.xyz
 # Set context
 builder:
  context: ".."
 # Set Dockerfile and context
 builder:
  dockerfile: "../Dockerfile.xyz"
  context: ".."
 ```
 ### Using multistage builder cache
 Docker multistage build cache can singlehandedly speed up your builds by a lot. Currently Kamal only supports using the GHA cache or the Registry cache:
 ```yaml
 # Using GHA cache
 builder:
  cache:
    type: gha
 # Using Registry cache
 builder:
  cache:
    type: registry
 # Using Registry cache with different cache image
 builder:
  cache:
    type: registry
    # default image name is <image>-build-cache
    image: application-cache-image
 # Using Registry cache with additinonal cache-to options
 builder:
  cache:
    type: registry
    options: mode=max,image-manifest=true,oci-mediatypes=true
 ```
 For further insights into build cache optimization, check out documentation on Docker's official website: https://docs.docker.com/build/cache/.
 ### Using build secrets for new images
-Some images need a secret passed in during build time, like a GITHUB_TOKEN, to give access to private gem repositories. This can be done by having the secret in ENV, then referencing it in the builder configuration:
+Some images need a secret passed in during build time, like a GITHUB_TOKEN to give access to private gem repositories. This can be done by having the secret in ENV, then referencing it in the builder configuration:
 ```yaml
 builder:
@@ -544,122 +247,28 @@ 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
 ```
-### Traefik command arguments
+### Using command arguments for Traefik
-Customize the Traefik command line using `args`:
+You can customize the traefik command line:
 ```yaml
 traefik:
-  args:
+  accesslog: true
-    accesslog: true
+  accesslog.format: json
-    accesslog.format: json
+  metrics.prometheus: true
  metrics.prometheus.buckets: 0.1,0.3,1.2,5.0
 ```
 This starts the Traefik container with `--accesslog=true --accesslog.format=json` arguments.
 ### Traefik host port binding
 Traefik binds to port 80 by default. Specify an alternative port using `host_port`:
 ```yaml
 traefik:
  host_port: 8080
 ```
 ### Traefik version, upgrades, and custom images
 Kamal runs the traefik:v2.9 image to track Traefik 2.9.x releases.
 To pin Traefik to a specific version or an image published to your registry,
 specify `image`:
 ```yaml
 traefik:
  image: traefik:v2.10.0-rc1
 ```
 This is useful for downgrading Traefik if there's an unexpected breaking
 change in a minor version release, upgrading Traefik to test forthcoming
 releases, or running your own Traefik-derived image.
 Kamal has not been tested for compatibility with Traefik 3 betas. Please do!
 ### Traefik container configuration
 Pass additional Docker configuration for the Traefik container using `options`:
 ```yaml
 traefik:
  options:
    publish:
      - 8080:8080
    volume:
      - /tmp/example.json:/tmp/example.json
    memory: 512m
 ```
 This starts the Traefik container with `--volume /tmp/example.json:/tmp/example.json --publish 8080:8080 --memory 512m` arguments to `docker run`.
 ### Traefik container labels
 Add labels to Traefik Docker container.
 ```yaml
 traefik:
  labels:
    traefik.enable: true
    traefik.http.routers.dashboard.rule: Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))
    traefik.http.routers.dashboard.service: api@internal
    traefik.http.routers.dashboard.middlewares: auth
    traefik.http.middlewares.auth.basicauth.users: test:$2y$05$H2o72tMaO.TwY1wNQUV1K.fhjRgLHRDWohFvUZOJHBEtUXNKrqUKi # test:password
 ```
 This labels Traefik container with `--label traefik.http.routers.dashboard.middlewares=\"auth\"` and so on.
 ### Traefik alternate entrypoints
 You can configure multiple entrypoints for Traefik like so:
 ```yaml
 service: myservice
 labels:
  traefik.tcp.routers.other.rule: 'HostSNI(`*`)'
  traefik.tcp.routers.other.entrypoints: otherentrypoint
  traefik.tcp.services.other.loadbalancer.server.port: 9000
  traefik.http.routers.myservice.entrypoints: web
  traefik.http.services.myservice.loadbalancer.server.port: 8080
 traefik:
  options:
    publish:
      - 9000:9000
  args:
    entrypoints.web.address: ':80'
    entrypoints.otherentrypoint.address: ':9000'
 ```
 ### Rebooting Traefik
 If you make changes to Traefik args or labels, you'll need to reboot with:
 `kamal traefik reboot`
 In production, reboot the Traefik containers one by one with a slower but safer approach, using a rolling reboot:
 `kamal traefik reboot --rolling`
 ### Configuring build args for new images
 Build arguments that aren't secret can also be configured:
@@ -673,13 +282,14 @@ builder:
 This build argument can then be used in the Dockerfile:
 ```
 # Private repositories need an access token during the build
 ARG RUBY_VERSION
 FROM ruby:$RUBY_VERSION-slim as base
 ```
 ### Using accessories for database, cache, search services
-You can manage your accessory services via Kamal as well. Accessories are long-lived services that your app depends on. They are not updated when you deploy.
+You can manage your accessory services via MRSK as well. The services will build off public images, and will not be automatically updated when you deploy:
 ```yaml
 accessories:
@@ -694,98 +304,32 @@ accessories:
        - MYSQL_ROOT_PASSWORD
    volumes:
      - /var/lib/mysql:/var/lib/mysql
    options:
      cpus: 4
      memory: "2GB"
  redis:
    image: redis:latest
-    roles:
+    host: 1.1.1.4
      - web
    port: "36379:6379"
    volumes:
      - /var/lib/redis:/data
  internal-example:
    image: registry.digitalocean.com/user/otherservice:latest
    host: 1.1.1.5
    port: 44444
 ```
-The hosts that the accessories will run on can be specified by hosts or roles:
+Now run `mrsk accessory start mysql` to start the MySQL server on 1.1.1.3. See `mrsk accessory` for all the commands possible.
-```yaml
+### Using a generated .env file
-  # Single host
+
-  mysql:
+If you're using a centralized secret store, like 1Password, you can create `.env.erb` as a template which looks up the secrets. Example of a .env.erb file:
-    host: 1.1.1.1
+
-  # Multiple hosts
+```erb
-  redis:
+<% if (session_token = `op signin --account my-one-password-account --raw`.strip) != "" %># Generated by mrsk envify
-    hosts:
+GITHUB_TOKEN=<%= `gh config get -h github.com oauth_token`.strip %>
-      - 1.1.1.1
+MRSK_REGISTRY_PASSWORD=<%= `op read "op://Vault/Docker Hub/password" -n --session  #{session_token}` %>
-      - 1.1.1.2
+RAILS_MASTER_KEY=<%= `op read "op://Vault/My App/RAILS_MASTER_SECRET" -n --session #{session_token}` %>
-  # By role
+MYSQL_ROOT_PASSWORD=<%= `op read "op://Vault/My App/MYSQL_ROOT_PASSWORD" -n --session #{session_token}` %>
-  monitoring:
+<% else raise ArgumentError, "Session token missing" end %>
    roles:
      - web
      - jobs
 ```
-Now run `kamal accessory start mysql` to start the MySQL server on 1.1.1.3. See `kamal accessory` for all the commands possible.
+This template can safely be checked into git. Then everyone deploying the app can run `mrsk envify` when they setup the app for the first time or passwords change to get the correct `.env` file.
-Accessory images must be public or tagged in your private registry.
+If you need separate env variables for different destinations, you can set them with `.env.destination.erb` for the template, which will generate `.env.staging` when run with `mrsk envify -d staging`.
 ### Using Cron
 You can use a specific container to run your Cron jobs:
 ```yaml
 servers:
  cron:
    hosts:
      - 192.168.0.1
    cmd:
      bash -c "cat config/crontab | crontab - && cron -f"
 ```
 This assumes the Cron settings are stored in `config/crontab`.
 ### Healthcheck
 Kamal uses Docker healthchecks to check the health of your application during deployment. Traefik uses this same healthcheck status to determine when a container is ready to receive traffic.
 The healthcheck defaults to testing the HTTP response to the path `/up` on port 3000, up to 7 times. You can tailor this behaviour with the `healthcheck` setting:
 ```yaml
 healthcheck:
  path: /healthz
  port: 4000
  max_attempts: 7
  interval: 20s
 ```
 This will ensure your application is configured with a traefik label for the healthcheck against `/healthz` and that the pre-deploy healthcheck that Kamal performs is done against the same path on port 4000.
 You can also specify a custom healthcheck command, which is useful for non-HTTP services:
 ```yaml
 healthcheck:
  cmd: /bin/check_health
 ```
 The top-level healthcheck configuration applies to all services that use
 Traefik, by default. You can also specialize the configuration at the role
 level:
 ```yaml
 servers:
  job:
    hosts: ...
    cmd: bin/jobs
    healthcheck:
      cmd: bin/check
 ```
 The healthcheck allows for an optional `max_attempts` setting, which will attempt the healthcheck up to the specified number of times before failing the deploy. This is useful for applications that take a while to start up. The default is 7.
 Note: The HTTP health checks assume that the `curl` command is available inside the container. If that's not the case, use the healthcheck's `cmd` option to specify an alternative check that the container supports.
 ## Commands
@@ -795,7 +339,7 @@ You can execute one-off commands on the servers:
 ```bash
 # Runs command on all servers
-kamal app exec 'ruby -v'
+mrsk app exec 'ruby -v'
 App Host: 192.168.0.1
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
@@ -803,12 +347,12 @@ App Host: 192.168.0.2
 ruby 3.1.3p185 (2022-11-24 revision 1a6b16756e) [x86_64-linux]
 # Runs command on primary server
-kamal app exec --primary 'cat .ruby-version'
+mrsk app exec --primary 'cat .ruby-version'
 App Host: 192.168.0.1
 3.1.3
 # Runs Rails command on all servers
-kamal app exec 'bin/rails about'
+mrsk app exec 'bin/rails about'
 App Host: 192.168.0.1
 About your application's environment
 Rails version             7.1.0.alpha
@@ -834,7 +378,7 @@ Database adapter          sqlite3
 Database schema version   20221231233303
 # Run Rails runner on primary server
-kamal app exec -p 'bin/rails runner "puts Rails.application.config.time_zone"'
+mrsk app exec -p 'bin/rails runner "puts Rails.application.config.time_zone"'
 UTC
 ```
@@ -844,19 +388,19 @@ You can run interactive commands, like a Rails console or a bash session, on a s
 ```bash
 # Starts a bash session in a new container made from the most recent app image
-kamal app exec -i bash
+mrsk app exec -i bash
 # Starts a bash session in the currently running container for the app
-kamal app exec -i --reuse bash
+mrsk app exec -i --reuse bash
 # Starts a Rails console in a new container made from the most recent app image
-kamal app exec -i 'bin/rails console'
+mrsk app exec -i 'bin/rails console'
 ```
-### Running details to show state of containers
+### Running details to see state of containers
-You can see the state of your servers by running `kamal details`:
+You can see the state of your servers by running `mrsk details`:
 ```
 Traefik Host: 192.168.0.1
@@ -876,11 +420,11 @@ CONTAINER ID   IMAGE
 1d3c91ed1f55   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483f86d05a123   "/rails/bin/docker-e…"   13 minutes ago   Up 13 minutes   3000/tcp   chat-6ef8a6a84c525b123c5245345a8483f86d05a123
 ```
-You can also see just info for app containers with `kamal app details` or just for Traefik with `kamal traefik details`.
+You can also see just info for app containers with `mrsk app details` or just for Traefik with `mrsk traefik details`.
 ### Running rollback to fix a bad deploy
-If you've discovered a bad deploy, you can quickly rollback by reactivating the old, paused container image. You can see what old containers are available for rollback by running `kamal app containers`. It'll give you a presentation similar to `kamal app details`, but include all the old containers as well. Showing something like this:
+If you've discovered a bad deploy, you can quickly rollback by reactivating the old, paused container image. You can see what old containers are available for rollback by running `mrsk app containers`. It'll give you a presentation similar to `mrsk app details`, but include all the old containers as well. Showing something like this:
 ```
 App Host: 192.168.0.1
@@ -894,128 +438,18 @@ badb1aa51db4   registry.digitalocean.com/user/app:6ef8a6a84c525b123c5245345a8483
 6f170d1172ae   registry.digitalocean.com/user/app:e5d9d7c2b898289dfbc5f7f1334140d984eedae4   "/rails/bin/docker-e…"   31 minutes ago   Exited (1) 27 minutes ago              chat-e5d9d7c2b898289dfbc5f7f1334140d984eedae4
 ```
-From the example above, we can see that `e5d9d7c2b898289dfbc5f7f1334140d984eedae4` was the last version, so it's available as a rollback target. We can perform this rollback by running `kamal rollback e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. That'll stop `6ef8a6a84c525b123c5245345a8483f86d05a123` and then start `e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. Because the old container is still available, this is very quick. Nothing to download from the registry.
+From the example above, we can see that `e5d9d7c2b898289dfbc5f7f1334140d984eedae4` was the last version, so it's available as a rollback target. We can perform this rollback by running `mrsk rollback e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. That'll stop `6ef8a6a84c525b123c5245345a8483f86d05a123` and then start `e5d9d7c2b898289dfbc5f7f1334140d984eedae4`. Because the old container is still available, this is very quick. Nothing to download from the registry.
-Note that by default old containers are pruned after 3 days when you run `kamal deploy`.
+Note that by default old containers are pruned after 3 days when you run `mrsk deploy`.
 ### Running removal to clean up servers
-If you wish to remove the entire application, including Traefik, containers, images, and registry session, you can run `kamal remove`. This will leave the servers clean.
+If you wish to remove the entire application, including Traefik, containers, images, and registry session, you can run `mrsk remove`. This will leave the servers clean.
 ## Locking
 Commands that are unsafe to run concurrently will take a deploy lock while they run. The lock is the `kamal_lock-<service>` directory on the primary server.
 You can check the lock status with:
 ```
 kamal lock status
 Locked by: AN Other at 2023-03-24 09:49:03 UTC
 Version: 77f45c0686811c68989d6576748475a60bf53fc2
 Message: Automatic deploy lock
 ```
 You can also manually acquire and release the lock
 ```
 kamal lock acquire -m "Doing maintenance"
 ```
 ```
 kamal lock release
 ```
 ## Rolling deployments
 When deploying to large numbers of hosts, you might prefer not to restart your services on every host at the same time.
 Kamal's default is to boot new containers on all hosts in parallel. But you can control this by configuring `boot/limit` and `boot/wait` as options:
 ```yaml
 service: myservice
 boot:
  limit: 10 # Can also specify as a percentage of total hosts, such as "25%"
  wait: 2
 ```
 When `limit` is specified, containers will be booted on, at most, `limit` hosts at once. Kamal will pause for `wait` seconds between batches.
 These settings only apply when booting containers (using `kamal deploy`, or `kamal app boot`). For other commands, Kamal continues to run commands in parallel across all hosts.
 ## Hooks
 You can run custom scripts at specific points with hooks.
 Hooks should be stored in the .kamal/hooks folder. Running kamal init will build that folder and add some sample scripts.
 You can change their location by setting `hooks_path` in the configuration file.
 If the script returns a non-zero exit code the command will be aborted.
 `KAMAL_*` environment variables are available to the hooks command for
 fine-grained audit reporting, e.g. for triggering deployment reports or
 firing a JSON webhook. These variables include:
 - `KAMAL_RECORDED_AT` - UTC timestamp in ISO 8601 format, e.g. `2023-04-14T17:07:31Z`
 - `KAMAL_PERFORMER` - the local user performing the command (from `whoami`)
 - `KAMAL_SERVICE_VERSION` - an abbreviated service and version for use in messages, e.g. app@150b24f
 - `KAMAL_VERSION` - the full version being deployed
 - `KAMAL_HOSTS` - a comma-separated list of the hosts targeted by the command
 - `KAMAL_COMMAND` - The command we are running
 - `KAMAL_SUBCOMMAND` - optional: The subcommand we are running
 - `KAMAL_DESTINATION` - optional: destination, e.g. "staging"
 - `KAMAL_ROLE` - optional: role targeted, e.g. "web"
 There are four hooks:
 1. pre-connect
 Called before taking the deploy lock. For checks that need to run before connecting to remote hosts - e.g. DNS warming.
 2. pre-build
 Used for pre-build checks - e.g. there are no uncommitted changes or that CI has passed.
 3. pre-deploy
 For final checks before deploying, e.g. checking CI completed
 3. post-deploy - run after a deploy, redeploy or rollback.
 This hook is also passed a `KAMAL_RUNTIME` env variable set to the total seconds the deploy took.
 This could be used to broadcast a deployment message, or register the new version with an APM.
 The command could look something like:
 ```bash
 #!/usr/bin/env bash
 curl -q -d content="[My App] ${KAMAL_PERFORMER} Rolled back to version ${KAMAL_VERSION}" https://3.basecamp.com/XXXXX/integrations/XXXXX/buckets/XXXXX/chats/XXXXX/lines
 ```
 That'll post a line like the following to a preconfigured chatbot in Basecamp:
 ```
 [My App] [dhh] Rolled back to version d264c4e92470ad1bd18590f04466787262f605de
 ```
 Set `--skip_hooks` to avoid running the hooks.
 ## SSH connection management
 Creating SSH connections concurrently can be an issue when deploying to many servers. By default Kamal will limit concurrent connection starts to 30 at a time.
 It also sets a long idle timeout of 900 seconds on connections to prevent re-connection storms after a long idle period, like building an image or waiting for CI.
 You can configure both of these settings:
 ```yaml
 sshkit:
  max_concurrent_starts: 10
  pool_idle_timeout: 300
 ```
 ## Stage of development
-This is beta software. Commands may still move around. But we're live in production at [37signals](https://37signals.com).
+This is alpha software. Lots of stuff is missing. Lots of stuff will keep moving around for a while.
 ## License
-Kamal is released under the [MIT License](https://opensource.org/licenses/MIT).
+MRSK is released under the [MIT License](https://opensource.org/licenses/MIT).
--- a/bin/kamal
+++ b/bin/kamal
@@ -3,16 +3,14 @@
 # Prevent failures from being reported twice.
 Thread.report_on_exception = false
-require "kamal"
+require "mrsk"
 begin
-  Kamal::Cli::Main.start(ARGV)
+  Mrsk::Cli::Main.start(ARGV)
 rescue SSHKit::Runner::ExecuteError => e
-  puts "  \e[31mERROR (#{e.cause.class}): #{e.message}\e[0m"
+  puts "  \e[31mERROR (#{e.cause.class}): #{e.cause.message}\e[0m"
  puts e.cause.backtrace if ENV["VERBOSE"]
  exit 1
 rescue => e
  puts "  \e[31mERROR (#{e.class}): #{e.message}\e[0m"
  puts e.backtrace if ENV["VERBOSE"]
  exit 1
 end
--- a/bin/release
+++ b/bin/release
@@ -2,13 +2,13 @@
 VERSION=$1
-printf "module Kamal\n  VERSION = \"$VERSION\"\nend\n" > ./lib/kamal/version.rb
+printf "module Mrsk\n  VERSION = \"$VERSION\"\nend\n" > ./lib/mrsk/version.rb
 bundle
-git add Gemfile.lock lib/kamal/version.rb
+git add Gemfile.lock lib/mrsk/version.rb
 git commit -m "Bump version for $VERSION"
 git push
 git tag v$VERSION
 git push --tags
-gem build kamal.gemspec
+gem build mrsk.gemspec
-gem push "kamal-$VERSION.gem" --host https://rubygems.org
+gem push "mrsk-$VERSION.gem" --host https://rubygems.org
-rm "kamal-$VERSION.gem"
+rm "mrsk-$VERSION.gem"
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -1,9 +0,0 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 git "https://github.com/rails/rails.git" do
  gem "railties"
  gem "activesupport"
 end
 gemspec path: "../"
--- a/kamal.gemspec
+++ b/kamal.gemspec
@@ -1,28 +0,0 @@
 require_relative "lib/kamal/version"
 Gem::Specification.new do |spec|
  spec.name        = "kamal"
  spec.version     = Kamal::VERSION
  spec.authors     = [ "David Heinemeier Hansson" ]
  spec.email       = "dhh@hey.com"
  spec.homepage    = "https://github.com/rails/kamal"
  spec.summary     = "Deploy web apps in containers to servers running Docker with zero downtime."
  spec.license     = "MIT"
  spec.files = Dir["lib/**/*", "MIT-LICENSE", "README.md"]
  spec.executables = %w[ kamal ]
  spec.add_dependency "activesupport", ">= 7.0"
  spec.add_dependency "sshkit", "~> 1.21"
  spec.add_dependency "net-ssh", "~> 7.0"
  spec.add_dependency "thor", "~> 1.2"
  spec.add_dependency "dotenv", "~> 2.8"
  spec.add_dependency "zeitwerk", "~> 2.5"
  spec.add_dependency "ed25519", "~> 1.2"
  spec.add_dependency "bcrypt_pbkdf", "~> 1.0"
  spec.add_dependency "concurrent-ruby", "~> 1.2"
  spec.add_development_dependency "debug"
  spec.add_development_dependency "mocha"
  spec.add_development_dependency "railties"
 end
--- a/lib/kamal/cli.rb
+++ b/lib/kamal/cli.rb
@@ -1,7 +0,0 @@
 module Kamal::Cli
  class LockError < StandardError; end
  class HookError < StandardError; end
 end
 # SSHKit uses instance eval, so we need a global const for ergonomics
 KAMAL = Kamal::Commander.new
--- a/lib/kamal/cli/accessory.rb
+++ b/lib/kamal/cli/accessory.rb
@@ -1,239 +0,0 @@
 class Kamal::Cli::Accessory < Kamal::Cli::Base
  desc "boot [NAME]", "Boot new accessory service on host (use NAME=all to boot all accessories)"
  def boot(name, login: true)
    mutating do
      if name == "all"
        KAMAL.accessory_names.each { |accessory_name| boot(accessory_name) }
      else
        with_accessory(name) do |accessory|
          directories(name)
          upload(name)
          on(accessory.hosts) do
            execute *KAMAL.registry.login if login
            execute *KAMAL.auditor.record("Booted #{name} accessory"), verbosity: :debug
            execute *accessory.run
          end
        end
      end
    end
  end
  desc "upload [NAME]", "Upload accessory files to host", hide: true
  def upload(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          accessory.files.each do |(local, remote)|
            accessory.ensure_local_file_present(local)
            execute *accessory.make_directory_for(remote)
            upload! local, remote
            execute :chmod, "755", remote
          end
        end
      end
    end
  end
  desc "directories [NAME]", "Create accessory directories on host", hide: true
  def directories(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          accessory.directories.keys.each do |host_path|
            execute *accessory.make_directory(host_path)
          end
        end
      end
    end
  end
  desc "reboot [NAME]", "Reboot existing accessory on host (stop container, remove container, start new container)"
  def reboot(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *KAMAL.registry.login
        end
        stop(name)
        remove_container(name)
        boot(name, login: false)
      end
    end
  end
  desc "start [NAME]", "Start existing accessory container on host"
  def start(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Started #{name} accessory"), verbosity: :debug
          execute *accessory.start
        end
      end
    end
  end
  desc "stop [NAME]", "Stop existing accessory container on host"
  def stop(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Stopped #{name} accessory"), verbosity: :debug
          execute *accessory.stop, raise_on_non_zero_exit: false
        end
      end
    end
  end
  desc "restart [NAME]", "Restart existing accessory container on host"
  def restart(name)
    mutating do
      with_accessory(name) do
        stop(name)
        start(name)
      end
    end
  end
  desc "details [NAME]", "Show details about accessory on host (use NAME=all to show all accessories)"
  def details(name)
    if name == "all"
      KAMAL.accessory_names.each { |accessory_name| details(accessory_name) }
    else
      with_accessory(name) do |accessory|
        on(accessory.hosts) { puts capture_with_info(*accessory.info) }
      end
    end
  end
  desc "exec [NAME] [CMD]", "Execute a custom command on servers (use --help to show options)"
  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
  def exec(name, cmd)
    with_accessory(name) do |accessory|
      case
      when options[:interactive] && options[:reuse]
        say "Launching interactive command with via SSH from existing container...", :magenta
        run_locally { exec accessory.execute_in_existing_container_over_ssh(cmd) }
      when options[:interactive]
        say "Launching interactive command via SSH from new container...", :magenta
        run_locally { exec accessory.execute_in_new_container_over_ssh(cmd) }
      when options[:reuse]
        say "Launching command from existing container...", :magenta
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
          capture_with_info(*accessory.execute_in_existing_container(cmd))
        end
      else
        say "Launching command from new container...", :magenta
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
          capture_with_info(*accessory.execute_in_new_container(cmd))
        end
      end
    end
  end
  desc "logs [NAME]", "Show log lines from accessory on host (use --help to show options)"
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
  def logs(name)
    with_accessory(name) do |accessory|
      grep = options[:grep]
      if options[:follow]
        run_locally do
          info "Following logs on #{accessory.hosts}..."
          info accessory.follow_logs(grep: grep)
          exec accessory.follow_logs(grep: grep)
        end
      else
        since = options[:since]
        lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
        on(accessory.hosts) do
          puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
        end
      end
    end
  end
  desc "remove [NAME]", "Remove accessory container, image and data directory from host (use NAME=all to remove all accessories)"
  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
  def remove(name)
    mutating do
      if name == "all"
        KAMAL.accessory_names.each { |accessory_name| remove(accessory_name) }
      else
        if options[:confirmed] || ask("This will remove all containers, images and data directories for #{name}. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
          with_accessory(name) do
            stop(name)
            remove_container(name)
            remove_image(name)
            remove_service_directory(name)
          end
        end
      end
    end
  end
  desc "remove_container [NAME]", "Remove accessory container from host", hide: true
  def remove_container(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Remove #{name} accessory container"), verbosity: :debug
          execute *accessory.remove_container
        end
      end
    end
  end
  desc "remove_image [NAME]", "Remove accessory image from host", hide: true
  def remove_image(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *KAMAL.auditor.record("Removed #{name} accessory image"), verbosity: :debug
          execute *accessory.remove_image
        end
      end
    end
  end
  desc "remove_service_directory [NAME]", "Remove accessory directory used for uploaded files and data directories from host", hide: true
  def remove_service_directory(name)
    mutating do
      with_accessory(name) do |accessory|
        on(accessory.hosts) do
          execute *accessory.remove_service_directory
        end
      end
    end
  end
  private
    def with_accessory(name)
      if accessory = KAMAL.accessory(name)
        yield accessory
      else
        error_on_missing_accessory(name)
      end
    end
    def error_on_missing_accessory(name)
      options = KAMAL.accessory_names.presence
      error \
        "No accessory by the name of '#{name}'" +
        (options ? " (options: #{options.to_sentence})" : "")
    end
 end
--- a/lib/kamal/cli/app.rb
+++ b/lib/kamal/cli/app.rb
@@ -1,296 +0,0 @@
 class Kamal::Cli::App < Kamal::Cli::Base
  desc "boot", "Boot app on servers (or reboot app if already running)"
  def boot
    mutating do
      hold_lock_on_error do
        say "Get most recent version available as an image...", :magenta unless options[:version]
        using_version(version_or_latest) do |version|
          say "Start container with version #{version} using a #{KAMAL.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta
          on(KAMAL.hosts) do
            execute *KAMAL.auditor.record("Tagging #{KAMAL.config.absolute_image} as the latest image"), verbosity: :debug
            execute *KAMAL.app.tag_current_as_latest
          end
          on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
            roles = KAMAL.roles_on(host)
            roles.each do |role|
              app = KAMAL.app(role: role)
              auditor = KAMAL.auditor(role: role)
              if capture_with_info(*app.container_id_for_version(version, only_running: true), raise_on_non_zero_exit: false).present?
                tmp_version = "#{version}_replaced_#{SecureRandom.hex(8)}"
                info "Renaming container #{version} to #{tmp_version} as already deployed on #{host}"
                execute *auditor.record("Renaming container #{version} to #{tmp_version}"), verbosity: :debug
                execute *app.rename_container(version: version, new_version: tmp_version)
              end
              execute *auditor.record("Booted app version #{version}"), verbosity: :debug
              old_version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
              execute *app.start_or_run(hostname: "#{host}-#{SecureRandom.hex(6)}")
              Kamal::Utils::HealthcheckPoller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
              execute *app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present?
            end
          end
        end
      end
    end
  end
  desc "start", "Start existing app container on servers"
  def start
    mutating do
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          execute *KAMAL.auditor.record("Started app version #{KAMAL.config.version}"), verbosity: :debug
          execute *KAMAL.app(role: role).start, raise_on_non_zero_exit: false
        end
      end
    end
  end
  desc "stop", "Stop app container on servers"
  def stop
    mutating do
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug
          execute *KAMAL.app(role: role).stop, raise_on_non_zero_exit: false
        end
      end
    end
  end
  # FIXME: Drop in favor of just containers?
  desc "details", "Show details about app containers"
  def details
    on(KAMAL.hosts) do |host|
      roles = KAMAL.roles_on(host)
      roles.each do |role|
        puts_by_host host, capture_with_info(*KAMAL.app(role: role).info)
      end
    end
  end
  desc "exec [CMD]", "Execute a custom command on servers (use --help to show options)"
  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
  def exec(cmd)
    case
    when options[:interactive] && options[:reuse]
      say "Get current version of running container...", :magenta unless options[:version]
      using_version(options[:version] || current_running_version) do |version|
        say "Launching interactive command with version #{version} via SSH from existing container on #{KAMAL.primary_host}...", :magenta
        run_locally { exec KAMAL.app(role: "web").execute_in_existing_container_over_ssh(cmd, host: KAMAL.primary_host) }
      end
    when options[:interactive]
      say "Get most recent version available as an image...", :magenta unless options[:version]
      using_version(version_or_latest) do |version|
        say "Launching interactive command with version #{version} via SSH from new container on #{KAMAL.primary_host}...", :magenta
        run_locally { exec KAMAL.app(role: KAMAL.primary_host.roles.first).execute_in_new_container_over_ssh(cmd, host: KAMAL.primary_host) }
      end
    when options[:reuse]
      say "Get current version of running container...", :magenta unless options[:version]
      using_version(options[:version] || current_running_version) do |version|
        say "Launching command with version #{version} from existing container...", :magenta
        on(KAMAL.hosts) do |host|
          roles = KAMAL.roles_on(host)
          roles.each do |role|
            execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}", role: role), verbosity: :debug
            puts_by_host host, capture_with_info(*KAMAL.app(role: role).execute_in_existing_container(cmd))
          end
        end
      end
    else
      say "Get most recent version available as an image...", :magenta unless options[:version]
      using_version(version_or_latest) do |version|
        say "Launching command with version #{version} from new container...", :magenta
        on(KAMAL.hosts) do |host|
          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}"), verbosity: :debug
          puts_by_host host, capture_with_info(*KAMAL.app.execute_in_new_container(cmd))
        end
      end
    end
  end
  desc "containers", "Show app containers on servers"
  def containers
    on(KAMAL.hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_containers) }
  end
  desc "stale_containers", "Detect app stale containers"
  option :stop, aliases: "-s", type: :boolean, default: false, desc: "Stop the stale containers found"
  def stale_containers
    mutating do
      stop = options[:stop]
      cli = self
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          cli.send(:stale_versions, host: host, role: role).each do |version|
            if stop
              puts_by_host host, "Stopping stale container for role #{role} with version #{version}"
              execute *KAMAL.app(role: role).stop(version: version), raise_on_non_zero_exit: false
            else
              puts_by_host host,  "Detected stale container for role #{role} with version #{version} (use `kamal app stale_containers --stop` to stop)"
            end
          end
        end
      end
    end
  end
  desc "images", "Show app images on servers"
  def images
    on(KAMAL.hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_images) }
  end
  desc "logs", "Show log lines from app on servers (use --help to show options)"
  option :since, aliases: "-s", desc: "Show lines since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of lines to show from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow log on primary server (or specific host set by --hosts)"
  def logs
    # FIXME: Catch when app containers aren't running
    grep = options[:grep]
    if options[:follow]
      run_locally do
        info "Following logs on #{KAMAL.primary_host}..."
        KAMAL.specific_roles ||= ["web"]
        role = KAMAL.roles_on(KAMAL.primary_host).first
        info KAMAL.app(role: role).follow_logs(host: KAMAL.primary_host, grep: grep)
        exec KAMAL.app(role: role).follow_logs(host: KAMAL.primary_host, grep: grep)
      end
    else
      since = options[:since]
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          begin
            puts_by_host host, capture_with_info(*KAMAL.app(role: role).logs(since: since, lines: lines, grep: grep))
          rescue SSHKit::Command::Failed
            puts_by_host host, "Nothing found"
          end
        end
      end
    end
  end
  desc "remove", "Remove app containers and images from servers"
  def remove
    mutating do
      stop
      remove_containers
      remove_images
    end
  end
  desc "remove_container [VERSION]", "Remove app container with given version from servers", hide: true
  def remove_container(version)
    mutating do
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          execute *KAMAL.auditor.record("Removed app container with version #{version}", role: role), verbosity: :debug
          execute *KAMAL.app(role: role).remove_container(version: version)
        end
      end
    end
  end
  desc "remove_containers", "Remove all app containers from servers", hide: true
  def remove_containers
    mutating do
      on(KAMAL.hosts) do |host|
        roles = KAMAL.roles_on(host)
        roles.each do |role|
          execute *KAMAL.auditor.record("Removed all app containers", role: role), verbosity: :debug
          execute *KAMAL.app(role: role).remove_containers
        end
      end
    end
  end
  desc "remove_images", "Remove all app images from servers", hide: true
  def remove_images
    mutating do
      on(KAMAL.hosts) do
        execute *KAMAL.auditor.record("Removed all app images"), verbosity: :debug
        execute *KAMAL.app.remove_images
      end
    end
  end
  desc "version", "Show app version currently running on servers"
  def version
    on(KAMAL.hosts) do |host|
      role = KAMAL.roles_on(host).first
      puts_by_host host, capture_with_info(*KAMAL.app(role: role).current_running_version).strip
    end
  end
  private
    def using_version(new_version)
      if new_version
        begin
          old_version = KAMAL.config.version
          KAMAL.config.version = new_version
          yield new_version
        ensure
          KAMAL.config.version = old_version
        end
      else
        yield KAMAL.config.version
      end
    end
    def current_running_version(host: KAMAL.primary_host)
      version = nil
      on(host) do
        role = KAMAL.roles_on(host).first
        version = capture_with_info(*KAMAL.app(role: role).current_running_version).strip
      end
      version.presence
    end
    def stale_versions(host:, role:)
      versions = nil
      on(host) do
        versions = \
          capture_with_info(*KAMAL.app(role: role).list_versions, raise_on_non_zero_exit: false)
          .split("\n")
          .drop(1)
      end
      versions
    end
    def version_or_latest
      options[:version] || "latest"
    end
 end
--- a/lib/kamal/cli/base.rb
+++ b/lib/kamal/cli/base.rb
@@ -1,171 +0,0 @@
 require "thor"
 require "dotenv"
 require "kamal/sshkit_with_ext"
 module Kamal::Cli
  class Base < Thor
    include SSHKit::DSL
    def self.exit_on_failure?() true end
    class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
    class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
    class_option :version, desc: "Run commands against a specific app version"
    class_option :primary, type: :boolean, aliases: "-p", desc: "Run commands only on primary host instead of all"
    class_option :hosts, aliases: "-h", desc: "Run commands on these hosts instead of all (separate by comma)"
    class_option :roles, aliases: "-r", desc: "Run commands on these roles instead of all (separate by comma)"
    class_option :config_file, aliases: "-c", default: "config/deploy.yml", desc: "Path to config file"
    class_option :destination, aliases: "-d", desc: "Specify destination to be used for config file (staging -> deploy.staging.yml)"
    class_option :skip_hooks, aliases: "-H", type: :boolean, default: false, desc: "Don't run hooks"
    def initialize(*)
      super
      load_envs
      initialize_commander(options_with_subcommand_class_options)
    end
    private
      def load_envs
        if destination = options[:destination]
          Dotenv.load(".env.#{destination}", ".env")
        else
          Dotenv.load(".env")
        end
      end
      def options_with_subcommand_class_options
        options.merge(@_initializer.last[:class_options] || {})
      end
      def initialize_commander(options)
        KAMAL.tap do |commander|
          if options[:verbose]
            ENV["VERBOSE"] = "1" # For backtraces via cli/start
            commander.verbosity = :debug
          end
          if options[:quiet]
            commander.verbosity = :error
          end
          commander.configure \
            config_file: Pathname.new(File.expand_path(options[:config_file])),
            destination: options[:destination],
            version: options[:version]
          commander.specific_hosts    = options[:hosts]&.split(",")
          commander.specific_roles    = options[:roles]&.split(",")
          commander.specific_primary! if options[:primary]
        end
      end
      def print_runtime
        started_at = Time.now
        yield
        return Time.now - started_at
      ensure
        runtime = Time.now - started_at
        puts "  Finished all in #{sprintf("%.1f seconds", runtime)}"
      end
      def mutating
        return yield if KAMAL.holding_lock?
        KAMAL.config.ensure_env_available
        run_hook "pre-connect"
        acquire_lock
        begin
          yield
        rescue
          if KAMAL.hold_lock_on_error?
            error "  \e[31mDeploy lock was not released\e[0m"
          else
            release_lock
          end
          raise
        end
        release_lock
      end
      def acquire_lock
        raise_if_locked do
          say "Acquiring the deploy lock...", :magenta
          on(KAMAL.primary_host) { execute *KAMAL.lock.acquire("Automatic deploy lock", KAMAL.config.version), verbosity: :debug }
        end
        KAMAL.holding_lock = true
      end
      def release_lock
        say "Releasing the deploy lock...", :magenta
        on(KAMAL.primary_host) { execute *KAMAL.lock.release, verbosity: :debug }
        KAMAL.holding_lock = false
      end
      def raise_if_locked
        yield
      rescue SSHKit::Runner::ExecuteError => e
        if e.message =~ /cannot create directory/
          on(KAMAL.primary_host) { puts capture_with_debug(*KAMAL.lock.status) }
          raise LockError, "Deploy lock found"
        else
          raise e
        end
      end
      def hold_lock_on_error
        if KAMAL.hold_lock_on_error?
          yield
        else
          KAMAL.hold_lock_on_error = true
          yield
          KAMAL.hold_lock_on_error = false
        end
      end
      def run_hook(hook, **extra_details)
        if !options[:skip_hooks] && KAMAL.hook.hook_exists?(hook)
          details = { hosts: KAMAL.hosts.join(","), command: command, subcommand: subcommand }
          say "Running the #{hook} hook...", :magenta
          run_locally do
            KAMAL.with_verbosity(:debug) { execute *KAMAL.hook.run(hook, **details, **extra_details) }
          rescue SSHKit::Command::Failed
            raise HookError.new("Hook `#{hook}` failed")
          end
        end
      end
      def command
        @kamal_command ||= begin
          invocation_class, invocation_commands = *first_invocation
          if invocation_class == Kamal::Cli::Main
            invocation_commands[0]
          else
            Kamal::Cli::Main.subcommand_classes.find { |command, clazz| clazz == invocation_class }[0]
          end
        end
      end
      def subcommand
        @kamal_subcommand ||= begin
          invocation_class, invocation_commands = *first_invocation
          invocation_commands[0] if invocation_class != Kamal::Cli::Main
        end
      end
      def first_invocation
        instance_variable_get("@_invocations").first
      end
    end
 end
--- a/lib/kamal/cli/build.rb
+++ b/lib/kamal/cli/build.rb
@@ -1,106 +0,0 @@
 class Kamal::Cli::Build < Kamal::Cli::Base
  class BuildError < StandardError; end
  desc "deliver", "Build app and push app image to registry then pull image on servers"
  def deliver
    mutating do
      push
      pull
    end
  end
  desc "push", "Build and push app image to registry"
  def push
    mutating do
      cli = self
      verify_local_dependencies
      run_hook "pre-build"
      if (uncommitted_changes = Kamal::Utils.uncommitted_changes).present?
        say "The following paths have uncommitted changes:\n #{uncommitted_changes}", :yellow
      end
      run_locally do
        begin
          KAMAL.with_verbosity(:debug) do
            execute *KAMAL.builder.push
          end
        rescue SSHKit::Command::Failed => e
          if e.message =~ /(no builder)|(no such file or directory)/
            error "Missing compatible builder, so creating a new one first"
            if cli.create
              KAMAL.with_verbosity(:debug) { execute *KAMAL.builder.push }
            end
          else
            raise
          end
        end
      end
    end
  end
  desc "pull", "Pull app image from registry onto servers"
  def pull
    mutating do
      on(KAMAL.hosts) do
        execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
        execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
        execute *KAMAL.builder.pull
      end
    end
  end
  desc "create", "Create a build setup"
  def create
    mutating do
      run_locally do
        begin
          debug "Using builder: #{KAMAL.builder.name}"
          execute *KAMAL.builder.create
        rescue SSHKit::Command::Failed => e
          if e.message =~ /stderr=(.*)/
            error "Couldn't create remote builder: #{$1}"
            false
          else
            raise
          end
        end
      end
    end
  end
  desc "remove", "Remove build setup"
  def remove
    mutating do
      run_locally do
        debug "Using builder: #{KAMAL.builder.name}"
        execute *KAMAL.builder.remove
      end
    end
  end
  desc "details", "Show build setup"
  def details
    run_locally do
      puts "Builder: #{KAMAL.builder.name}"
      puts capture(*KAMAL.builder.info)
    end
  end
  private
    def verify_local_dependencies
      run_locally do
        begin
          execute *KAMAL.builder.ensure_local_dependencies_installed
        rescue SSHKit::Command::Failed => e
          build_error = e.message =~ /command not found/ ?
            "Docker is not installed locally" :
            "Docker buildx plugin is not installed locally"
          raise BuildError, build_error
        end
      end
    end
 end
--- a/lib/kamal/cli/healthcheck.rb
+++ b/lib/kamal/cli/healthcheck.rb
@@ -1,20 +0,0 @@
 class Kamal::Cli::Healthcheck < Kamal::Cli::Base
  default_command :perform
  desc "perform", "Health check current app version"
  def perform
    on(KAMAL.primary_host) do
      begin
        execute *KAMAL.healthcheck.run
        Kamal::Utils::HealthcheckPoller.wait_for_healthy { capture_with_info(*KAMAL.healthcheck.status) }
      rescue Kamal::Utils::HealthcheckPoller::HealthcheckError => e
        error capture_with_info(*KAMAL.healthcheck.logs)
        error capture_with_pretty_json(*KAMAL.healthcheck.container_health_log)
        raise
      ensure
        execute *KAMAL.healthcheck.stop, raise_on_non_zero_exit: false
        execute *KAMAL.healthcheck.remove, raise_on_non_zero_exit: false
      end
    end
  end
 end
--- a/lib/kamal/cli/lock.rb
+++ b/lib/kamal/cli/lock.rb
@@ -1,37 +0,0 @@
 class Kamal::Cli::Lock < Kamal::Cli::Base
  desc "status", "Report lock status"
  def status
    handle_missing_lock do
      on(KAMAL.primary_host) { puts capture_with_debug(*KAMAL.lock.status) }
    end
  end
  desc "acquire", "Acquire the deploy lock"
  option :message, aliases: "-m", type: :string, desc: "A lock message", required: true
  def acquire
    message = options[:message]
    raise_if_locked do
      on(KAMAL.primary_host) { execute *KAMAL.lock.acquire(message, KAMAL.config.version), verbosity: :debug }
      say "Acquired the deploy lock"
    end
  end
  desc "release", "Release the deploy lock"
  def release
    handle_missing_lock do
      on(KAMAL.primary_host) { execute *KAMAL.lock.release, verbosity: :debug }
      say "Released the deploy lock"
    end
  end
  private
    def handle_missing_lock
      yield
    rescue SSHKit::Runner::ExecuteError => e
      if e.message =~ /No such file or directory/
        say "There is no deploy lock"
      else
        raise
      end
    end
 end
--- a/lib/kamal/cli/main.rb
+++ b/lib/kamal/cli/main.rb
@@ -1,249 +0,0 @@
 class Kamal::Cli::Main < Kamal::Cli::Base
  desc "setup", "Setup all accessories and deploy app to servers"
  def setup
    print_runtime do
      mutating do
        invoke "kamal:cli:server:bootstrap"
        invoke "kamal:cli:accessory:boot", [ "all" ]
        deploy
      end
    end
  end
  desc "deploy", "Deploy app to servers"
  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
  def deploy
    runtime = print_runtime do
      mutating do
        invoke_options = deploy_options
        say "Log into image registry...", :magenta
        invoke "kamal:cli:registry:login", [], invoke_options
        if options[:skip_push]
          say "Pull app image...", :magenta
          invoke "kamal:cli:build:pull", [], invoke_options
        else
          say "Build and push app image...", :magenta
          invoke "kamal:cli:build:deliver", [], invoke_options
        end
        run_hook "pre-deploy"
        say "Ensure Traefik is running...", :magenta
        invoke "kamal:cli:traefik:boot", [], invoke_options
        say "Ensure app can pass healthcheck...", :magenta
        invoke "kamal:cli:healthcheck:perform", [], invoke_options
        say "Detect stale containers...", :magenta
        invoke "kamal:cli:app:stale_containers", [], invoke_options
        invoke "kamal:cli:app:boot", [], invoke_options
        say "Prune old containers and images...", :magenta
        invoke "kamal:cli:prune:all", [], invoke_options
      end
    end
    run_hook "post-deploy", runtime: runtime.round
  end
  desc "redeploy", "Deploy app to servers without bootstrapping servers, starting Traefik, pruning, and registry login"
  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
  def redeploy
    runtime = print_runtime do
      mutating do
        invoke_options = deploy_options
        if options[:skip_push]
          say "Pull app image...", :magenta
          invoke "kamal:cli:build:pull", [], invoke_options
        else
          say "Build and push app image...", :magenta
          invoke "kamal:cli:build:deliver", [], invoke_options
        end
        run_hook "pre-deploy"
        say "Ensure app can pass healthcheck...", :magenta
        invoke "kamal:cli:healthcheck:perform", [], invoke_options
        say "Detect stale containers...", :magenta
        invoke "kamal:cli:app:stale_containers", [], invoke_options
        invoke "kamal:cli:app:boot", [], invoke_options
      end
    end
    run_hook "post-deploy", runtime: runtime.round
  end
  desc "rollback [VERSION]", "Rollback app to VERSION"
  def rollback(version)
    rolled_back = false
    runtime = print_runtime do
      mutating do
        invoke_options = deploy_options
        KAMAL.config.version = version
        old_version = nil
        if container_available?(version)
          run_hook "pre-deploy"
          invoke "kamal:cli:app:boot", [], invoke_options.merge(version: version)
          rolled_back = true
        else
          say "The app version '#{version}' is not available as a container (use 'kamal app containers' for available versions)", :red
        end
      end
    end
    run_hook "post-deploy", runtime: runtime.round if rolled_back
  end
  desc "details", "Show details about all containers"
  def details
    invoke "kamal:cli:traefik:details"
    invoke "kamal:cli:app:details"
    invoke "kamal:cli:accessory:details", [ "all" ]
  end
  desc "audit", "Show audit log from servers"
  def audit
    on(KAMAL.hosts) do |host|
      puts_by_host host, capture_with_info(*KAMAL.auditor.reveal)
    end
  end
  desc "config", "Show combined config (including secrets!)"
  def config
    run_locally do
      puts Kamal::Utils.redacted(KAMAL.config.to_h).to_yaml
    end
  end
  desc "init", "Create config stub in config/deploy.yml and env stub in .env"
  option :bundle, type: :boolean, default: false, desc: "Add Kamal to the Gemfile and create a bin/kamal binstub"
  def init
    require "fileutils"
    if (deploy_file = Pathname.new(File.expand_path("config/deploy.yml"))).exist?
      puts "Config file already exists in config/deploy.yml (remove first to create a new one)"
    else
      FileUtils.mkdir_p deploy_file.dirname
      FileUtils.cp_r Pathname.new(File.expand_path("templates/deploy.yml", __dir__)), deploy_file
      puts "Created configuration file in config/deploy.yml"
    end
    unless (deploy_file = Pathname.new(File.expand_path(".env"))).exist?
      FileUtils.cp_r Pathname.new(File.expand_path("templates/template.env", __dir__)), deploy_file
      puts "Created .env file"
    end
    unless (hooks_dir = Pathname.new(File.expand_path(".kamal/hooks"))).exist?
      hooks_dir.mkpath
      Pathname.new(File.expand_path("templates/sample_hooks", __dir__)).each_child do |sample_hook|
        FileUtils.cp sample_hook, hooks_dir, preserve: true
      end
      puts "Created sample hooks in .kamal/hooks"
    end
    if options[:bundle]
      if (binstub = Pathname.new(File.expand_path("bin/kamal"))).exist?
        puts "Binstub already exists in bin/kamal (remove first to create a new one)"
      else
        puts "Adding Kamal to Gemfile and bundle..."
        run_locally do
          execute :bundle, :add, :kamal
          execute :bundle, :binstubs, :kamal
        end
        puts "Created binstub file in bin/kamal"
      end
    end
  end
  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"
      env_path          = ".env.#{destination}"
    else
      env_template_path = ".env.erb"
      env_path          = ".env"
    end
    File.write(env_path, ERB.new(File.read(env_template_path)).result, perm: 0600)
  end
  desc "remove", "Remove Traefik, app, accessories, and registry session from servers"
  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
  def remove
    mutating do
      if options[:confirmed] || ask("This will remove all containers and images. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
        invoke "kamal:cli:traefik:remove", [], options.without(:confirmed)
        invoke "kamal:cli:app:remove", [], options.without(:confirmed)
        invoke "kamal:cli:accessory:remove", [ "all" ], options
        invoke "kamal:cli:registry:logout", [], options.without(:confirmed)
      end
    end
  end
  desc "version", "Show Kamal version"
  def version
    puts Kamal::VERSION
  end
  desc "accessory", "Manage accessories (db/redis/search)"
  subcommand "accessory", Kamal::Cli::Accessory
  desc "app", "Manage application"
  subcommand "app", Kamal::Cli::App
  desc "build", "Build application image"
  subcommand "build", Kamal::Cli::Build
  desc "healthcheck", "Healthcheck application"
  subcommand "healthcheck", Kamal::Cli::Healthcheck
  desc "lock", "Manage the deploy lock"
  subcommand "lock", Kamal::Cli::Lock
  desc "prune", "Prune old application images and containers"
  subcommand "prune", Kamal::Cli::Prune
  desc "registry", "Login and -out of the image registry"
  subcommand "registry", Kamal::Cli::Registry
  desc "server", "Bootstrap servers with curl and Docker"
  subcommand "server", Kamal::Cli::Server
  desc "traefik", "Manage Traefik load balancer"
  subcommand "traefik", Kamal::Cli::Traefik
  private
    def container_available?(version)
      begin
        on(KAMAL.hosts) do
          KAMAL.roles_on(host).each do |role|
            container_id = capture_with_info(*KAMAL.app(role: role).container_id_for_version(version))
            raise "Container not found" unless container_id.present?
          end
        end
      rescue SSHKit::Runner::ExecuteError => e
        if e.message =~ /Container not found/
          say "Error looking for container version #{version}: #{e.message}"
          return false
        else
          raise
        end
      end
      true
    end
    def deploy_options
      { "version" => KAMAL.config.version }.merge(options.without("skip_push"))
    end
 end
--- a/lib/kamal/cli/prune.rb
+++ b/lib/kamal/cli/prune.rb
@@ -1,30 +0,0 @@
 class Kamal::Cli::Prune < Kamal::Cli::Base
  desc "all", "Prune unused images and stopped containers"
  def all
    mutating do
      containers
      images
    end
  end
  desc "images", "Prune dangling images"
  def images
    mutating do
      on(KAMAL.hosts) do
        execute *KAMAL.auditor.record("Pruned images"), verbosity: :debug
        execute *KAMAL.prune.dangling_images
        execute *KAMAL.prune.tagged_images
      end
    end
  end
  desc "containers", "Prune all stopped containers, except the last 5"
  def containers
    mutating do
      on(KAMAL.hosts) do
        execute *KAMAL.auditor.record("Pruned containers"), verbosity: :debug
        execute *KAMAL.prune.containers
      end
    end
  end
 end
--- a/lib/kamal/cli/registry.rb
+++ b/lib/kamal/cli/registry.rb
@@ -1,18 +0,0 @@
 class Kamal::Cli::Registry < Kamal::Cli::Base
  desc "login", "Log in to registry locally and remotely"
  def login
    run_locally    { execute *KAMAL.registry.login }
    on(KAMAL.hosts) { execute *KAMAL.registry.login }
  # FIXME: This rescue needed?
  rescue ArgumentError => e
    puts e.message
  end
  desc "logout", "Log out of registry remotely"
  def logout
    on(KAMAL.hosts) { execute *KAMAL.registry.logout }
  # FIXME: This rescue needed?
  rescue ArgumentError => e
    puts e.message
  end
 end
--- a/lib/kamal/cli/server.rb
+++ b/lib/kamal/cli/server.rb
@@ -1,21 +0,0 @@
 class Kamal::Cli::Server < Kamal::Cli::Base
  desc "bootstrap", "Set up Docker to run Kamal apps"
  def bootstrap
    missing = []
    on(KAMAL.hosts | KAMAL.accessory_hosts) do |host|
      unless execute(*KAMAL.docker.installed?, raise_on_non_zero_exit: false)
        if execute(*KAMAL.docker.superuser?, raise_on_non_zero_exit: false)
          info "Missing Docker on #{host}. Installing…"
          execute *KAMAL.docker.install
        else
          missing << host
        end
      end
    end
    if missing.any?
      raise "Docker is not installed on #{missing.join(", ")} and can't be automatically installed without having root access and the `curl` command available. Install Docker manually: https://docs.docker.com/engine/install/"
    end
  end
 end
--- a/lib/kamal/cli/templates/deploy.yml
+++ b/lib/kamal/cli/templates/deploy.yml
@@ -1,74 +0,0 @@
 # Name of your application. Used to uniquely configure containers.
 service: my-app
 # Name of the container image.
 image: user/my-app
 # Deploy to these servers.
 servers:
  - 192.168.0.1
 # Credentials for your image host.
 registry:
  # Specify the registry server, if you're not using Docker Hub
  # server: registry.digitalocean.com / ghcr.io / ...
  username: my-user
  # Always use an access token rather than real password when possible.
  password:
    - KAMAL_REGISTRY_PASSWORD
 # Inject ENV variables into containers (secrets come from .env).
 # env:
 #   clear:
 #     DB_HOST: 192.168.0.2
 #   secret:
 #     - RAILS_MASTER_KEY
 # Use a different ssh user than root
 # ssh:
 #   user: app
 # Configure builder setup.
 # builder:
 #   args:
 #     RUBY_VERSION: 3.2.0
 #   secrets:
 #     - GITHUB_TOKEN
 #   remote:
 #     arch: amd64
 #     host: ssh://app@192.168.0.1
 # Use accessory services (secrets come from .env).
 # accessories:
 #   db:
 #     image: mysql:8.0
 #     host: 192.168.0.2
 #     port: 3306
 #     env:
 #       clear:
 #         MYSQL_ROOT_HOST: '%'
 #       secret:
 #         - MYSQL_ROOT_PASSWORD
 #     files:
 #       - config/mysql/production.cnf:/etc/mysql/my.cnf
 #       - db/production.sql.erb:/docker-entrypoint-initdb.d/setup.sql
 #     directories:
 #       - data:/var/lib/mysql
 #   redis:
 #     image: redis:7.0
 #     host: 192.168.0.2
 #     port: 6379
 #     directories:
 #       - data:/data
 # Configure custom arguments for Traefik
 # traefik:
 #   args:
 #     accesslog: true
 #     accesslog.format: json
 # Configure a custom healthcheck (default is /up on port 3000)
 # healthcheck:
 #   path: /healthz
 #   port: 4000
--- a/lib/kamal/cli/templates/sample_hooks/post-deploy.sample
+++ b/lib/kamal/cli/templates/sample_hooks/post-deploy.sample
@@ -1,14 +0,0 @@
 #!/bin/sh
 # A sample post-deploy hook
 #
 # These environment variables are available:
 # KAMAL_RECORDED_AT
 # KAMAL_PERFORMER
 # KAMAL_VERSION
 # KAMAL_HOSTS
 # KAMAL_ROLE (if set)
 # KAMAL_DESTINATION (if set)
 # KAMAL_RUNTIME
 echo "$KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds"
--- a/lib/kamal/cli/templates/sample_hooks/pre-build.sample
+++ b/lib/kamal/cli/templates/sample_hooks/pre-build.sample
@@ -1,51 +0,0 @@
 #!/bin/sh
 # A sample pre-build hook
 #
 # Checks:
 # 1. We have a clean checkout
 # 2. A remote is configured
 # 3. The branch has been pushed to the remote
 # 4. The version we are deploying matches the remote
 #
 # These environment variables are available:
 # KAMAL_RECORDED_AT
 # KAMAL_PERFORMER
 # KAMAL_VERSION
 # KAMAL_HOSTS
 # KAMAL_ROLE (if set)
 # KAMAL_DESTINATION (if set)
 if [ -n "$(git status --porcelain)" ]; then
  echo "Git checkout is not clean, aborting..." >&2
  git status --porcelain >&2
  exit 1
 fi
 first_remote=$(git remote)
 if [ -z "$first_remote" ]; then
  echo "No git remote set, aborting..." >&2
  exit 1
 fi
 current_branch=$(git branch --show-current)
 if [ -z "$current_branch" ]; then
  echo "No git remote set, aborting..." >&2
  exit 1
 fi
 remote_head=$(git ls-remote $first_remote --tags $current_branch | cut -f1)
 if [ -z "$remote_head" ]; then
  echo "Branch not pushed to remote, aborting..." >&2
  exit 1
 fi
 if [ "$KAMAL_VERSION" != "$remote_head" ]; then
  echo "Version ($KAMAL_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2
  exit 1
 fi
 exit 0
--- a/lib/kamal/cli/templates/sample_hooks/pre-connect.sample
+++ b/lib/kamal/cli/templates/sample_hooks/pre-connect.sample
@@ -1,47 +0,0 @@
 #!/usr/bin/env ruby
 # A sample pre-connect check
 #
 # Warms DNS before connecting to hosts in parallel
 #
 # These environment variables are available:
 # KAMAL_RECORDED_AT
 # KAMAL_PERFORMER
 # KAMAL_VERSION
 # KAMAL_HOSTS
 # KAMAL_ROLE (if set)
 # KAMAL_DESTINATION (if set)
 # KAMAL_RUNTIME
 hosts = ENV["KAMAL_HOSTS"].split(",")
 results = nil
 max = 3
 elapsed = Benchmark.realtime do
  results = hosts.map do |host|
    Thread.new do
      tries = 1
      begin
        Socket.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
      rescue SocketError
        if tries < max
          puts "Retrying DNS warmup: #{host}"
          tries += 1
          sleep rand
          retry
        else
          puts "DNS warmup failed: #{host}"
          host
        end
      end
      tries
    end
  end.map(&:value)
 end
 retries = results.sum - hosts.size
 nopes = results.count { |r| r == max }
 puts "Prewarmed %d DNS lookups in %.2f sec: %d retries, %d failures" % [ hosts.size, elapsed, retries, nopes ]
--- a/lib/kamal/cli/templates/sample_hooks/pre-deploy.sample
+++ b/lib/kamal/cli/templates/sample_hooks/pre-deploy.sample
@@ -1,109 +0,0 @@
 #!/usr/bin/env ruby
 # A sample pre-deploy hook
 #
 # Checks the Github status of the build, waiting for a pending build to complete for up to 720 seconds.
 #
 # Fails unless the combined status is "success"
 #
 # These environment variables are available:
 # KAMAL_RECORDED_AT
 # KAMAL_PERFORMER
 # KAMAL_VERSION
 # KAMAL_HOSTS
 # KAMAL_COMMAND
 # KAMAL_SUBCOMMAND
 # KAMAL_ROLE (if set)
 # KAMAL_DESTINATION (if set)
 # Only check the build status for production deployments
 if ENV["KAMAL_COMMAND"] == "rollback" || ENV["KAMAL_DESTINATION"] != "production"
  exit 0
 end
 require "bundler/inline"
 # true = install gems so this is fast on repeat invocations
 gemfile(true, quiet: true) do
  source "https://rubygems.org"
  gem "octokit"
  gem "faraday-retry"
 end
 MAX_ATTEMPTS = 72
 ATTEMPTS_GAP = 10
 def exit_with_error(message)
  $stderr.puts message
  exit 1
 end
 class GithubStatusChecks
  attr_reader :remote_url, :git_sha, :github_client, :combined_status
  def initialize
    @remote_url = `git config --get remote.origin.url`.strip.delete_prefix("https://github.com/")
    @git_sha = `git rev-parse HEAD`.strip
    @github_client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
    refresh!
  end
  def refresh!
    @combined_status = github_client.combined_status(remote_url, git_sha)
  end
  def state
    combined_status[:state]
  end
  def first_status_url
    first_status = combined_status[:statuses].find { |status| status[:state] == state }
    first_status && first_status[:target_url]
  end
  def complete_count
    combined_status[:statuses].count { |status| status[:state] != "pending"}
  end
  def total_count
    combined_status[:statuses].count
  end
  def current_status
    if total_count > 0
      "Completed #{complete_count}/#{total_count} checks, see #{first_status_url} ..."
    else
      "Build not started..."
    end
  end
 end
 $stdout.sync = true
 puts "Checking build status..."
 attempts = 0
 checks = GithubStatusChecks.new
 begin
  loop do
    case checks.state
    when "success"
      puts "Checks passed, see #{checks.first_status_url}"
      exit 0
    when "failure"
      exit_with_error "Checks failed, see #{checks.first_status_url}"
    when "pending"
      attempts += 1
    end
    exit_with_error "Checks are still pending, gave up after #{MAX_ATTEMPTS * ATTEMPTS_GAP} seconds" if attempts == MAX_ATTEMPTS
    puts checks.current_status
    sleep(ATTEMPTS_GAP)
    checks.refresh!
  end
 rescue Octokit::NotFound
  exit_with_error "Build status could not be found"
 end
--- a/lib/kamal/cli/templates/template.env
+++ b/lib/kamal/cli/templates/template.env
@@ -1,2 +0,0 @@
 KAMAL_REGISTRY_PASSWORD=change-this
 RAILS_MASTER_KEY=another-env
--- a/lib/kamal/cli/traefik.rb
+++ b/lib/kamal/cli/traefik.rb
@@ -1,111 +0,0 @@
 class Kamal::Cli::Traefik < Kamal::Cli::Base
  desc "boot", "Boot Traefik on servers"
  def boot
    mutating do
      on(KAMAL.traefik_hosts) do
        execute *KAMAL.registry.login
        execute *KAMAL.traefik.start_or_run
      end
    end
  end
  desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
  option :rolling, type: :boolean, default: false, desc: "Reboot traefik on hosts in sequence, rather than in parallel"
  def reboot
    mutating do
      on(KAMAL.traefik_hosts, in: options[:rolling] ? :sequence : :parallel) do
        execute *KAMAL.auditor.record("Rebooted traefik"), verbosity: :debug
        execute *KAMAL.registry.login
        execute *KAMAL.traefik.stop
        execute *KAMAL.traefik.remove_container
        execute *KAMAL.traefik.run
      end
    end
  end
  desc "start", "Start existing Traefik container on servers"
  def start
    mutating do
      on(KAMAL.traefik_hosts) do
        execute *KAMAL.auditor.record("Started traefik"), verbosity: :debug
        execute *KAMAL.traefik.start
      end
    end
  end
  desc "stop", "Stop existing Traefik container on servers"
  def stop
    mutating do
      on(KAMAL.traefik_hosts) do
        execute *KAMAL.auditor.record("Stopped traefik"), verbosity: :debug
        execute *KAMAL.traefik.stop
      end
    end
  end
  desc "restart", "Restart existing Traefik container on servers"
  def restart
    mutating do
      stop
      start
    end
  end
  desc "details", "Show details about Traefik container from servers"
  def details
    on(KAMAL.traefik_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.traefik.info), type: "Traefik" }
  end
  desc "logs", "Show log lines from Traefik on servers"
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
  def logs
    grep = options[:grep]
    if options[:follow]
      run_locally do
        info "Following logs on #{KAMAL.primary_host}..."
        info KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep)
        exec KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep)
      end
    else
      since = options[:since]
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
      on(KAMAL.traefik_hosts) do |host|
        puts_by_host host, capture(*KAMAL.traefik.logs(since: since, lines: lines, grep: grep)), type: "Traefik"
      end
    end
  end
  desc "remove", "Remove Traefik container and image from servers"
  def remove
    mutating do
      stop
      remove_container
      remove_image
    end
  end
  desc "remove_container", "Remove Traefik container from servers", hide: true
  def remove_container
    mutating do
      on(KAMAL.traefik_hosts) do
        execute *KAMAL.auditor.record("Removed traefik container"), verbosity: :debug
        execute *KAMAL.traefik.remove_container
      end
    end
  end
  desc "remove_image", "Remove Traefik image from servers", hide: true
  def remove_image
    mutating do
      on(KAMAL.traefik_hosts) do
        execute *KAMAL.auditor.record("Removed traefik image"), verbosity: :debug
        execute *KAMAL.traefik.remove_image
      end
    end
  end
 end
--- a/lib/kamal/commander.rb
+++ b/lib/kamal/commander.rb
@@ -1,154 +0,0 @@
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/module/delegation"
 class Kamal::Commander
  attr_accessor :verbosity, :holding_lock, :hold_lock_on_error
  def initialize
    self.verbosity = :info
    self.holding_lock = false
    self.hold_lock_on_error = false
  end
  def config
    @config ||= Kamal::Configuration.create_from(**@config_kwargs).tap do |config|
      @config_kwargs = nil
      configure_sshkit_with(config)
    end
  end
  def configure(**kwargs)
    @config, @config_kwargs = nil, kwargs
  end
  attr_reader :specific_roles, :specific_hosts
  def specific_primary!
    self.specific_hosts = [ config.primary_web_host ]
  end
  def specific_roles=(role_names)
    @specific_roles = config.roles.select { |r| role_names.include?(r.name) } if role_names.present?
  end
  def specific_hosts=(hosts)
    @specific_hosts = config.all_hosts & hosts if hosts.present?
  end
  def primary_host
    specific_hosts&.first || specific_roles&.first&.primary_host || config.primary_web_host
  end
  def roles
    (specific_roles || config.roles).select do |role|
      ((specific_hosts || config.all_hosts) & role.hosts).any?
    end
  end
  def hosts
    (specific_hosts || config.all_hosts).select do |host|
      (specific_roles || config.roles).flat_map(&:hosts).include?(host)
    end
  end
  def boot_strategy
    if config.boot.limit.present?
      { in: :groups, limit: config.boot.limit, wait: config.boot.wait }
    else
      {}
    end
  end
  def roles_on(host)
    roles.select { |role| role.hosts.include?(host.to_s) }.map(&:name)
  end
  def traefik_hosts
    specific_hosts || config.traefik_hosts
  end
  def accessory_hosts
    specific_hosts || config.accessories.flat_map(&:hosts)
  end
  def accessory_names
    config.accessories&.collect(&:name) || []
  end
  def app(role: nil)
    Kamal::Commands::App.new(config, role: role)
  end
  def accessory(name)
    Kamal::Commands::Accessory.new(config, name: name)
  end
  def auditor(**details)
    Kamal::Commands::Auditor.new(config, **details)
  end
  def builder
    @builder ||= Kamal::Commands::Builder.new(config)
  end
  def docker
    @docker ||= Kamal::Commands::Docker.new(config)
  end
  def healthcheck
    @healthcheck ||= Kamal::Commands::Healthcheck.new(config)
  end
  def hook
    @hook ||= Kamal::Commands::Hook.new(config)
  end
  def lock
    @lock ||= Kamal::Commands::Lock.new(config)
  end
  def prune
    @prune ||= Kamal::Commands::Prune.new(config)
  end
  def registry
    @registry ||= Kamal::Commands::Registry.new(config)
  end
  def traefik
    @traefik ||= Kamal::Commands::Traefik.new(config)
  end
  def with_verbosity(level)
    old_level = self.verbosity
    self.verbosity = level
    SSHKit.config.output_verbosity = level
    yield
  ensure
    self.verbosity = old_level
    SSHKit.config.output_verbosity = old_level
  end
  def holding_lock?
    self.holding_lock
  end
  def hold_lock_on_error?
    self.hold_lock_on_error
  end
  private
    # Lazy setup of SSHKit
    def configure_sshkit_with(config)
      SSHKit::Backend::Netssh.pool.idle_timeout = config.sshkit.pool_idle_timeout
      SSHKit::Backend::Netssh.configure do |sshkit|
        sshkit.max_concurrent_starts = config.sshkit.max_concurrent_starts
        sshkit.ssh_options = config.ssh.options
      end
      SSHKit.config.command_map[:docker] = "docker" # No need to use /usr/bin/env, just clogs up the logs
      SSHKit.config.output_verbosity = verbosity
    end
 end
--- a/lib/kamal/commands.rb
+++ b/lib/kamal/commands.rb
@@ -1,2 +0,0 @@
 module Kamal::Commands
 end
--- a/lib/kamal/commands/app.rb
+++ b/lib/kamal/commands/app.rb
@@ -1,175 +0,0 @@
 class Kamal::Commands::App < Kamal::Commands::Base
  ACTIVE_DOCKER_STATUSES = [ :running, :restarting ]
  attr_reader :role
  def initialize(config, role: nil)
    super(config)
    @role = role
  end
  def start_or_run(hostname: nil)
    combine start, run(hostname: hostname), by: "||"
  end
  def run(hostname: nil)
    role = config.role(self.role)
    docker :run,
      "--detach",
      "--restart unless-stopped",
      "--name", container_name,
      *(["--hostname", hostname] if hostname),
      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
      *role.env_args,
      *role.health_check_args,
      *config.logging_args,
      *config.volume_args,
      *role.label_args,
      *role.option_args,
      config.absolute_image,
      role.cmd
  end
  def start
    docker :start, container_name
  end
  def status(version:)
    pipe container_id_for_version(version), xargs(docker(:inspect, "--format", DOCKER_HEALTH_STATUS_FORMAT))
  end
  def stop(version: nil)
    pipe \
      version ? container_id_for_version(version) : current_running_container_id,
      xargs(config.stop_wait_time ? docker(:stop, "-t", config.stop_wait_time) : docker(:stop))
  end
  def info
    docker :ps, *filter_args
  end
  def logs(since: nil, lines: nil, grep: nil)
    pipe \
      current_running_container_id,
      "xargs docker logs#{" --since #{since}" if since}#{" --tail #{lines}" if lines} 2>&1",
      ("grep '#{grep}'" if grep)
  end
  def follow_logs(host:, grep: nil)
    run_over_ssh \
      pipe(
        current_running_container_id,
        "xargs docker logs --timestamps --tail 10 --follow 2>&1",
        (%(grep "#{grep}") if grep)
      ),
      host: host
  end
  def execute_in_existing_container(*command, interactive: false)
    docker :exec,
      ("-it" if interactive),
      container_name,
      *command
  end
  def execute_in_new_container(*command, interactive: false)
    role = config.role(self.role)
    docker :run,
      ("-it" if interactive),
      "--rm",
      *config.env_args,
      *config.volume_args,
      *role&.option_args,
      config.absolute_image,
      *command
  end
  def execute_in_existing_container_over_ssh(*command, host:)
    run_over_ssh execute_in_existing_container(*command, interactive: true), host: host
  end
  def execute_in_new_container_over_ssh(*command, host:)
    run_over_ssh execute_in_new_container(*command, interactive: true), host: host
  end
  def current_running_container_id
    docker :ps, "--quiet", *filter_args(statuses: ACTIVE_DOCKER_STATUSES), "--latest"
  end
  def container_id_for_version(version, only_running: false)
    container_id_for(container_name: container_name(version), only_running: only_running)
  end
  def current_running_version
    list_versions("--latest", statuses: ACTIVE_DOCKER_STATUSES)
  end
  def list_versions(*docker_args, statuses: nil)
    pipe \
      docker(:ps, *filter_args(statuses: statuses), *docker_args, "--format", '"{{.Names}}"'),
      %(while read line; do echo ${line##{service_role_dest}-}; done) # Extract SHA from "service-role-dest-SHA"
  end
  def list_containers
    docker :container, :ls, "--all", *filter_args
  end
  def list_container_names
    [ *list_containers, "--format", "'{{ .Names }}'" ]
  end
  def remove_container(version:)
    pipe \
      container_id_for(container_name: container_name(version)),
      xargs(docker(:container, :rm))
  end
  def rename_container(version:, new_version:)
    docker :rename, container_name(version), container_name(new_version)
  end
  def remove_containers
    docker :container, :prune, "--force", *filter_args
  end
  def list_images
    docker :image, :ls, config.repository
  end
  def remove_images
    docker :image, :prune, "--all", "--force", *filter_args
  end
  def tag_current_as_latest
    docker :tag, config.absolute_image, config.latest_image
  end
  private
    def container_name(version = nil)
      [ config.service, role, config.destination, version || config.version ].compact.join("-")
    end
    def filter_args(statuses: nil)
      argumentize "--filter", filters(statuses: statuses)
    end
    def service_role_dest
      [config.service, role, config.destination].compact.join("-")
    end
    def filters(statuses: nil)
      [ "label=service=#{config.service}" ].tap do |filters|
        filters << "label=destination=#{config.destination}" if config.destination
        filters << "label=role=#{role}" if role
        statuses&.each do |status|
          filters << "status=#{status}"
        end
      end
    end
 end
--- a/lib/kamal/commands/auditor.rb
+++ b/lib/kamal/commands/auditor.rb
@@ -1,28 +0,0 @@
 class Kamal::Commands::Auditor < Kamal::Commands::Base
  attr_reader :details
  def initialize(config, **details)
    super(config)
    @details = details
  end
  # Runs remotely
  def record(line, **details)
    append \
      [ :echo, audit_tags(**details).except(:version, :service_version).to_s, line ],
      audit_log_file
  end
  def reveal
    [ :tail, "-n", 50, audit_log_file ]
  end
  private
    def audit_log_file
      [ "kamal", config.service, config.destination, "audit.log" ].compact.join("-")
    end
    def audit_tags(**details)
      tags(**self.details, **details)
    end
 end
--- a/lib/kamal/commands/base.rb
+++ b/lib/kamal/commands/base.rb
@@ -1,65 +0,0 @@
 module Kamal::Commands
  class Base
    delegate :sensitive, :argumentize, to: Kamal::Utils
    DOCKER_HEALTH_STATUS_FORMAT = "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'"
    DOCKER_HEALTH_LOG_FORMAT    = "'{{json .State.Health}}'"
    attr_accessor :config
    def initialize(config)
      @config = config
    end
    def run_over_ssh(*command, host:)
      "ssh".tap do |cmd|
        if config.ssh.proxy && config.ssh.proxy.is_a?(Net::SSH::Proxy::Jump)
          cmd << " -J #{config.ssh.proxy.jump_proxies}"
        elsif config.ssh.proxy && config.ssh.proxy.is_a?(Net::SSH::Proxy::Command)
          cmd << " -o ProxyCommand='#{config.ssh.proxy.command_line_template}'"
        end
        cmd << " -t #{config.ssh.user}@#{host} '#{command.join(" ")}'"
      end
    end
    def container_id_for(container_name:, only_running: false)
      docker :container, :ls, *("--all" unless only_running), "--filter", "name=^#{container_name}$", "--quiet"
    end
    private
      def combine(*commands, by: "&&")
        commands
          .compact
          .collect { |command| Array(command) + [ by ] }.flatten # Join commands
          .tap     { |commands| commands.pop } # Remove trailing combiner
      end
      def chain(*commands)
        combine *commands, by: ";"
      end
      def pipe(*commands)
        combine *commands, by: "|"
      end
      def append(*commands)
        combine *commands, by: ">>"
      end
      def write(*commands)
        combine *commands, by: ">"
      end
      def xargs(command)
        [ :xargs, command ].flatten
      end
      def docker(*args)
        args.compact.unshift :docker
      end
      def tags(**details)
        Kamal::Tags.from_config(config, **details)
      end
  end
 end
--- a/lib/kamal/commands/builder.rb
+++ b/lib/kamal/commands/builder.rb
@@ -1,62 +0,0 @@
 class Kamal::Commands::Builder < Kamal::Commands::Base
  delegate :create, :remove, :push, :clean, :pull, :info, to: :target
  def name
    target.class.to_s.remove("Kamal::Commands::Builder::").underscore.inquiry
  end
  def target
    case
    when !config.builder.multiarch? && !config.builder.cached?
      native
    when !config.builder.multiarch? && config.builder.cached?
      native_cached
    when config.builder.local? && config.builder.remote?
      multiarch_remote
    when config.builder.remote?
      native_remote
    else
      multiarch
    end
  end
  def native
    @native ||= Kamal::Commands::Builder::Native.new(config)
  end
  def native_cached
    @native ||= Kamal::Commands::Builder::Native::Cached.new(config)
  end
  def native_remote
    @native ||= Kamal::Commands::Builder::Native::Remote.new(config)
  end
  def multiarch
    @multiarch ||= Kamal::Commands::Builder::Multiarch.new(config)
  end
  def multiarch_remote
    @multiarch_remote ||= Kamal::Commands::Builder::Multiarch::Remote.new(config)
  end
  def ensure_local_dependencies_installed
    if name.native?
      ensure_local_docker_installed
    else
      combine \
        ensure_local_docker_installed,
        ensure_local_buildx_installed
    end
  end
  private
    def ensure_local_docker_installed
      docker "--version"
    end
    def ensure_local_buildx_installed
      docker :buildx, "version"
    end
 end
--- a/lib/kamal/commands/builder/base.rb
+++ b/lib/kamal/commands/builder/base.rb
@@ -1,60 +0,0 @@
 class Kamal::Commands::Builder::Base < Kamal::Commands::Base
  class BuilderError < StandardError; end
  delegate :argumentize, to: Kamal::Utils
  delegate :args, :secrets, :dockerfile, :local_arch, :local_host, :remote_arch, :remote_host, :cache_from, :cache_to, to: :builder_config
  def clean
    docker :image, :rm, "--force", config.absolute_image
  end
  def pull
    docker :pull, config.absolute_image
  end
  def build_options
    [ *build_tags, *build_cache, *build_labels, *build_args, *build_secrets, *build_dockerfile ]
  end
  def build_context
    config.builder.context
  end
  private
    def build_tags
      [ "-t", config.absolute_image, "-t", config.latest_image ]
    end
    def build_cache
      if cache_to && cache_from
        ["--cache-to", cache_to,
          "--cache-from", cache_from]
      end
    end
    def build_labels
      argumentize "--label", { service: config.service }
    end
    def build_args
      argumentize "--build-arg", args, sensitive: true
    end
    def build_secrets
      argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
    end
    def build_dockerfile
      if Pathname.new(File.expand_path(dockerfile)).exist?
        argumentize "--file", dockerfile
      else
        raise BuilderError, "Missing #{dockerfile}"
      end
    end
    def builder_config
      config.builder
    end
 end
--- a/lib/kamal/commands/builder/native.rb
+++ b/lib/kamal/commands/builder/native.rb
@@ -1,20 +0,0 @@
 class Kamal::Commands::Builder::Native < Kamal::Commands::Builder::Base
  def create
    # No-op on native without cache
  end
  def remove
    # No-op on native without cache
  end
  def push
    combine \
      docker(:build, *build_options, build_context),
      docker(:push, config.absolute_image),
      docker(:push, config.latest_image)
  end
  def info
    # No-op on native
  end
 end
--- a/lib/kamal/commands/builder/native/cached.rb
+++ b/lib/kamal/commands/builder/native/cached.rb
@@ -1,16 +0,0 @@
 class Kamal::Commands::Builder::Native::Cached < Kamal::Commands::Builder::Native
  def create
    docker :buildx, :create, "--use", "--driver=docker-container"
  end
  def remove
    docker :buildx, :rm, builder_name
  end
  def push
    docker :buildx, :build,
      "--push",
      *build_options,
      build_context
  end
 end
--- a/lib/kamal/commands/docker.rb
+++ b/lib/kamal/commands/docker.rb
@@ -1,21 +0,0 @@
 class Kamal::Commands::Docker < Kamal::Commands::Base
  # Install Docker using the https://github.com/docker/docker-install convenience script.
  def install
    pipe [ :curl, "-fsSL", "https://get.docker.com" ], :sh
  end
  # Checks the Docker client version. Fails if Docker is not installed.
  def installed?
    docker "-v"
  end
  # Checks the Docker server version. Fails if Docker is not running.
  def running?
    docker :version
  end
  # Do we have superuser access to install Docker and start system services?
  def superuser?
    [ '[ "${EUID:-$(id -u)}" -eq 0 ]' ]
  end
 end
--- a/lib/kamal/commands/healthcheck.rb
+++ b/lib/kamal/commands/healthcheck.rb
@@ -1,57 +0,0 @@
 class Kamal::Commands::Healthcheck < Kamal::Commands::Base
  EXPOSED_PORT = 3999
  def run
    web = config.role(:web)
    docker :run,
      "--detach",
      "--name", container_name_with_version,
      "--publish", "#{EXPOSED_PORT}:#{config.healthcheck["port"]}",
      "--label", "service=#{container_name}",
      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
      *web.env_args,
      *web.health_check_args,
      *config.volume_args,
      *web.option_args,
      config.absolute_image,
      web.cmd
  end
  def status
    pipe container_id, xargs(docker(:inspect, "--format", DOCKER_HEALTH_STATUS_FORMAT))
  end
  def container_health_log
    pipe container_id, xargs(docker(:inspect, "--format", DOCKER_HEALTH_LOG_FORMAT))
  end
  def logs
    pipe container_id, xargs(docker(:logs, "--tail", 50, "2>&1"))
  end
  def stop
    pipe container_id, xargs(docker(:stop))
  end
  def remove
    pipe container_id, xargs(docker(:container, :rm))
  end
  private
    def container_name
      [ "healthcheck", config.service, config.destination ].compact.join("-")
    end
    def container_name_with_version
      "#{container_name}-#{config.version}"
    end
    def container_id
      container_id_for(container_name: container_name_with_version)
    end
    def health_url
      "http://localhost:#{EXPOSED_PORT}#{config.healthcheck["path"]}"
    end
 end
--- a/lib/kamal/commands/hook.rb
+++ b/lib/kamal/commands/hook.rb
@@ -1,14 +0,0 @@
 class Kamal::Commands::Hook < Kamal::Commands::Base
  def run(hook, **details)
    [ hook_file(hook), env: tags(**details).env ]
  end
  def hook_exists?(hook)
    Pathname.new(hook_file(hook)).exist?
  end
  private
    def hook_file(hook)
      "#{config.hooks_path}/#{hook}"
    end
 end
--- a/lib/kamal/commands/lock.rb
+++ b/lib/kamal/commands/lock.rb
@@ -1,63 +0,0 @@
 require "active_support/duration"
 require "time"
 class Kamal::Commands::Lock < Kamal::Commands::Base
  def acquire(message, version)
    combine \
      [:mkdir, lock_dir],
      write_lock_details(message, version)
  end
  def release
    combine \
      [:rm, lock_details_file],
      [:rm, "-r", lock_dir]
  end
  def status
    combine \
      stat_lock_dir,
      read_lock_details
  end
  private
    def write_lock_details(message, version)
      write \
        [:echo, "\"#{Base64.encode64(lock_details(message, version))}\""],
        lock_details_file
    end
    def read_lock_details
      pipe \
        [:cat, lock_details_file],
        [:base64, "-d"]
    end
    def stat_lock_dir
      write \
        [:stat, lock_dir],
        "/dev/null"
    end
    def lock_dir
      "kamal_lock-#{config.service}"
    end
    def lock_details_file
      [lock_dir, :details].join("/")
    end
    def lock_details(message, version)
      <<~DETAILS.strip
        Locked by: #{locked_by} at #{Time.now.utc.iso8601}
        Version: #{version}
        Message: #{message}
      DETAILS
    end
    def locked_by
      `git config user.name`.strip
    rescue Errno::ENOENT
      "Unknown"
    end
 end
--- a/lib/kamal/commands/prune.rb
+++ b/lib/kamal/commands/prune.rb
@@ -1,38 +0,0 @@
 require "active_support/duration"
 require "active_support/core_ext/numeric/time"
 class Kamal::Commands::Prune < Kamal::Commands::Base
  def dangling_images
    docker :image, :prune, "--force", "--filter", "label=service=#{config.service}", "--filter", "dangling=true"
  end
  def tagged_images
    pipe \
      docker(:image, :ls, *service_filter, "--format", "'{{.ID}} {{.Repository}}:{{.Tag}}'"),
      "grep -v -w \"#{active_image_list}\"",
      "while read image tag; do docker rmi $tag; done"
  end
  def containers(keep_last: 5)
    pipe \
      docker(:ps, "-q", "-a", *service_filter, *stopped_containers_filters),
      "tail -n +#{keep_last + 1}",
      "while read container_id; do docker rm $container_id; done"
  end
  private
    def stopped_containers_filters
      [ "created", "exited", "dead" ].flat_map { |status| ["--filter", "status=#{status}"] }
    end
    def active_image_list
      # Pull the images that are used by any containers
      # Append repo:latest - to avoid deleting the latest tag
      # Append repo:<none> - to avoid deleting dangling images that are in use. Unused dangling images are deleted separately
      "$(docker container ls -a --format '{{.Image}}\\|' --filter label=service=#{config.service} | tr -d '\\n')#{config.latest_image}\\|#{config.repository}:<none>"
    end
    def service_filter
      [ "--filter", "label=service=#{config.service}" ]
    end
 end
--- a/lib/kamal/commands/registry.rb
+++ b/lib/kamal/commands/registry.rb
@@ -1,20 +0,0 @@
 class Kamal::Commands::Registry < Kamal::Commands::Base
  delegate :registry, to: :config
  def login
    docker :login, registry["server"], "-u", sensitive(lookup("username")), "-p", sensitive(lookup("password"))
  end
  def logout
    docker :logout, registry["server"]
  end
  private
    def lookup(key)
      if registry[key].is_a?(Array)
        ENV.fetch(registry[key].first).dup
      else
        registry[key]
      end
    end
 end
--- a/lib/kamal/commands/traefik.rb
+++ b/lib/kamal/commands/traefik.rb
@@ -1,104 +0,0 @@
 class Kamal::Commands::Traefik < Kamal::Commands::Base
  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
  DEFAULT_IMAGE = "traefik:v2.9"
  CONTAINER_PORT = 80
  DEFAULT_ARGS = {
    'log.level' => 'DEBUG'
  }
  def run
    docker :run, "--name traefik",
      "--detach",
      "--restart", "unless-stopped",
      "--publish", port,
      "--volume", "/var/run/docker.sock:/var/run/docker.sock",
      *env_args,
      *config.logging_args,
      *label_args,
      *docker_options_args,
      image,
      "--providers.docker",
      *cmd_option_args
  end
  def start
    docker :container, :start, "traefik"
  end
  def stop
    docker :container, :stop, "traefik"
  end
  def start_or_run
    combine start, run, by: "||"
  end
  def info
    docker :ps, "--filter", "name=^traefik$"
  end
  def logs(since: nil, lines: nil, grep: nil)
    pipe \
      docker(:logs, "traefik", (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
      ("grep '#{grep}'" if grep)
  end
  def follow_logs(host:, grep: nil)
    run_over_ssh pipe(
      docker(:logs, "traefik", "--timestamps", "--tail", "10", "--follow", "2>&1"),
      (%(grep "#{grep}") if grep)
    ).join(" "), host: host
  end
  def remove_container
    docker :container, :prune, "--force", "--filter", "label=org.opencontainers.image.title=Traefik"
  end
  def remove_image
    docker :image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=Traefik"
  end
  def port
    "#{host_port}:#{CONTAINER_PORT}"
  end
  private
    def label_args
      argumentize "--label", labels
    end
    def env_args
      env_config = config.traefik["env"] || {}
      if env_config.present?
        argumentize_env_with_secrets(env_config)
      else
        []
      end
    end
    def labels
      config.traefik["labels"] || []
    end
    def image
      config.traefik.fetch("image") { DEFAULT_IMAGE }
    end
    def docker_options_args
      optionize(config.traefik["options"] || {})
    end
    def cmd_option_args
      if args = config.traefik["args"]
        optionize DEFAULT_ARGS.merge(args), with: "="
      else
        optionize DEFAULT_ARGS, with: "="
      end
    end
    def host_port
      config.traefik["host_port"] || CONTAINER_PORT
    end
 end
--- a/lib/kamal/configuration.rb
+++ b/lib/kamal/configuration.rb
@@ -1,251 +0,0 @@
 require "active_support/ordered_options"
 require "active_support/core_ext/string/inquiry"
 require "active_support/core_ext/module/delegation"
 require "pathname"
 require "erb"
 require "net/ssh/proxy/jump"
 class Kamal::Configuration
  delegate :service, :image, :servers, :env, :labels, :registry, :stop_wait_time, :hooks_path, to: :raw_config, allow_nil: true
  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
  attr_accessor :destination
  attr_accessor :raw_config
  class << self
    def create_from(config_file:, destination: nil, version: nil)
      raw_config = load_config_files(config_file, *destination_config_file(config_file, destination))
      new raw_config, destination: destination, version: version
    end
    private
      def load_config_files(*files)
        files.inject({}) { |config, file| config.deep_merge! load_config_file(file) }
      end
      def load_config_file(file)
        if file.exist?
          YAML.load(ERB.new(IO.read(file)).result).symbolize_keys
        else
          raise "Configuration file not found in #{file}"
        end
      end
      def destination_config_file(base_config_file, destination)
        base_config_file.sub_ext(".#{destination}.yml") if destination
      end
  end
  def initialize(raw_config, destination: nil, version: nil, validate: true)
    @raw_config = ActiveSupport::InheritableOptions.new(raw_config)
    @destination = destination
    @declared_version = version
    valid? if validate
  end
  def version=(version)
    @declared_version = version
  end
  def version
    @declared_version.presence || ENV["VERSION"] || git_version
  end
  def abbreviated_version
    Kamal::Utils.abbreviate_version(version)
  end
  def roles
    @roles ||= role_names.collect { |role_name| Role.new(role_name, config: self) }
  end
  def role(name)
    roles.detect { |r| r.name == name.to_s }
  end
  def accessories
    @accessories ||= raw_config.accessories&.keys&.collect { |name| Kamal::Configuration::Accessory.new(name, config: self) } || []
  end
  def accessory(name)
    accessories.detect { |a| a.name == name.to_s }
  end
  def all_hosts
    roles.flat_map(&:hosts).uniq
  end
  def primary_web_host
    role(:web).primary_host
  end
  def traefik_hosts
    roles.select(&:running_traefik?).flat_map(&:hosts).uniq
  end
  def boot
    Kamal::Configuration::Boot.new(config: self)
  end
  def repository
    [ raw_config.registry["server"], image ].compact.join("/")
  end
  def absolute_image
    "#{repository}:#{version}"
  end
  def latest_image
    "#{repository}:latest"
  end
  def service_with_version
    "#{service}-#{version}"
  end
  def env_args
    if raw_config.env.present?
      argumentize_env_with_secrets(raw_config.env)
    else
      []
    end
  end
  def volume_args
    if raw_config.volumes.present?
      argumentize "--volume", raw_config.volumes
    else
      []
    end
  end
  def logging_args
    if raw_config.logging.present?
      optionize({ "log-driver" => raw_config.logging["driver"] }.compact) +
        argumentize("--log-opt", raw_config.logging["options"])
    else
      argumentize("--log-opt", { "max-size" => "10m" })
    end
  end
  def ssh
    Kamal::Configuration::Ssh.new(config: self)
  end
  def sshkit
    Kamal::Configuration::Sshkit.new(config: self)
  end
  def healthcheck
    { "path" => "/up", "port" => 3000, "max_attempts" => 7 }.merge(raw_config.healthcheck || {})
  end
  def readiness_delay
    raw_config.readiness_delay || 7
  end
  def minimum_version
    raw_config.minimum_version
  end
  def valid?
    ensure_required_keys_present && ensure_valid_kamal_version
  end
  def to_h
    {
      roles: role_names,
      hosts: all_hosts,
      primary_host: primary_web_host,
      version: version,
      repository: repository,
      absolute_image: absolute_image,
      service_with_version: service_with_version,
      env_args: env_args,
      volume_args: volume_args,
      ssh_options: ssh.to_h,
      sshkit: sshkit.to_h,
      builder: builder.to_h,
      accessories: raw_config.accessories,
      logging: logging_args,
      healthcheck: healthcheck
    }.compact
  end
  def traefik
    raw_config.traefik || {}
  end
  def hooks_path
    raw_config.hooks_path || ".kamal/hooks"
  end
  def builder
    Kamal::Configuration::Builder.new(config: self)
  end
  # Will raise KeyError if any secret ENVs are missing
  def ensure_env_available
    env_args
    roles.each(&:env_args)
    true
  end
  private
    # Will raise ArgumentError if any required config keys are missing
    def ensure_required_keys_present
      %i[ service image registry servers ].each do |key|
        raise ArgumentError, "Missing required configuration for #{key}" unless raw_config[key].present?
      end
      if raw_config.registry["username"].blank?
        raise ArgumentError, "You must specify a username for the registry in config/deploy.yml"
      end
      if raw_config.registry["password"].blank?
        raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
      end
      roles.each do |role|
        if role.hosts.empty?
          raise ArgumentError, "No servers specified for the #{role.name} role"
        end
      end
      true
    end
    def ensure_valid_kamal_version
      if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION)
        raise ArgumentError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
      end
      true
    end
    def role_names
      raw_config.servers.is_a?(Array) ? [ "web" ] : raw_config.servers.keys.sort
    end
    def git_version
      @git_version ||=
        if system("git rev-parse")
          uncommitted_suffix = Kamal::Utils.uncommitted_changes.present? ? "_uncommitted_#{SecureRandom.hex(8)}" : ""
          "#{`git rev-parse HEAD`.strip}#{uncommitted_suffix}"
        else
          raise "Can't use commit hash as version, no git repository found in #{Dir.pwd}"
        end
    end
 end
--- a/lib/kamal/configuration/boot.rb
+++ b/lib/kamal/configuration/boot.rb
@@ -1,20 +0,0 @@
 class Kamal::Configuration::Boot
  def initialize(config:)
    @options = config.raw_config.boot || {}
    @host_count = config.all_hosts.count
  end
  def limit
    limit = @options["limit"]
    if limit.to_s.end_with?("%")
      @host_count * limit.to_i / 100
    else
      limit
    end
  end
  def wait
    @options["wait"]
  end
 end
--- a/lib/kamal/configuration/builder.rb
+++ b/lib/kamal/configuration/builder.rb
@@ -1,114 +0,0 @@
 class Kamal::Configuration::Builder
  def initialize(config:)
    @options = config.raw_config.builder || {}
    @image = config.image
    @server = config.registry["server"]
    valid?
  end
  def to_h
    @options
  end
  def multiarch?
    @options["multiarch"] != false
  end
  def local?
    !!@options["local"]
  end
  def remote?
    !!@options["remote"]
  end
  def cached?
    !!@options["cache"]
  end
  def args
    @options["args"] || {}
  end
  def secrets
    @options["secrets"] || []
  end
  def dockerfile
    @options["dockerfile"] || "Dockerfile"
  end
  def context
    @options["context"] || "."
  end
  def local_arch
    @options["local"]["arch"] if local?
  end
  def local_host
    @options["local"]["host"] if local?
  end
  def remote_arch
    @options["remote"]["arch"] if remote?
  end
  def remote_host
    @options["remote"]["host"] if remote?
  end
  def cache_from
    if cached?
      case @options["cache"]["type"]
      when "gha"
        cache_from_config_for_gha
      when "registry"
        cache_from_config_for_registry
      end
    end
  end
  def cache_to
    if cached?
      case @options["cache"]["type"]
      when "gha"
        cache_to_config_for_gha
      when "registry"
        cache_to_config_for_registry
      end
    end
  end
  private
    def valid?
      if @options["cache"] && @options["cache"]["type"]
        raise ArgumentError, "Invalid cache type: #{@options["cache"]["type"]}" unless ["gha", "registry"].include?(@options["cache"]["type"])
      end
    end
    def cache_image
      @options["cache"]&.fetch("image", nil) || "#{@image}-build-cache"
    end
    def cache_image_ref
      [ @server, cache_image ].compact.join("/")
    end
    def cache_from_config_for_gha
      "type=gha"
    end
    def cache_from_config_for_registry
      [ "type=registry", "ref=#{cache_image_ref}" ].compact.join(",")
    end
    def cache_to_config_for_gha
      [ "type=gha", @options["cache"]&.fetch("options", nil)].compact.join(",")
    end
    def cache_to_config_for_registry
      [ "type=registry", @options["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
    end
 end
--- a/lib/kamal/configuration/ssh.rb
+++ b/lib/kamal/configuration/ssh.rb
@@ -1,38 +0,0 @@
 class Kamal::Configuration::Ssh
  LOGGER = ::Logger.new(STDERR)
  def initialize(config:)
    @config = config.raw_config.ssh || {}
  end
  def user
    config.fetch("user", "root")
  end
  def proxy
    if (proxy = config["proxy"])
      Net::SSH::Proxy::Jump.new(proxy.include?("@") ? proxy : "root@#{proxy}")
    elsif (proxy_command = config["proxy_command"])
      Net::SSH::Proxy::Command.new(proxy_command)
    end
  end
  def options
    { user: user, proxy: proxy, auth_methods: [ "publickey" ], logger: logger, keepalive: true, keepalive_interval: 30 }.compact
  end
  def to_h
    options.except(:logger).merge(log_level: log_level)
  end
  private
    attr_accessor :config
    def logger
      LOGGER.tap { |logger| logger.level = log_level }
    end
    def log_level
      config.fetch("log_level", :fatal)
    end
 end
--- a/lib/kamal/configuration/sshkit.rb
+++ b/lib/kamal/configuration/sshkit.rb
@@ -1,20 +0,0 @@
 class Kamal::Configuration::Sshkit
  def initialize(config:)
    @options = config.raw_config.sshkit || {}
  end
  def max_concurrent_starts
    options.fetch("max_concurrent_starts", 30)
  end
  def pool_idle_timeout
    options.fetch("pool_idle_timeout", 900)
  end
  def to_h
    options
  end
  private
    attr_accessor :options
 end
--- a/lib/kamal/sshkit_with_ext.rb
+++ b/lib/kamal/sshkit_with_ext.rb
@@ -1,104 +0,0 @@
 require "sshkit"
 require "sshkit/dsl"
 require "active_support/core_ext/hash/deep_merge"
 require "json"
 class SSHKit::Backend::Abstract
  def capture_with_info(*args, **kwargs)
    capture(*args, **kwargs, verbosity: Logger::INFO)
  end
  def capture_with_debug(*args, **kwargs)
    capture(*args, **kwargs, verbosity: Logger::DEBUG)
  end
  def capture_with_pretty_json(*args, **kwargs)
    JSON.pretty_generate(JSON.parse(capture(*args, **kwargs)))
  end
  def puts_by_host(host, output, type: "App")
    puts "#{type} Host: #{host}\n#{output}\n\n"
  end
  # Our execution pattern is for the CLI execute args lists returned
  # from commands, but this doesn't support returning execution options
  # from the command.
  #
  # Support this by using kwargs for CLI options and merging with the
  # args-extracted options.
  module CommandEnvMerge
    private
    # Override to merge options returned by commands in the args list with
    # options passed by the CLI and pass them along as kwargs.
    def command(args, options)
      more_options, args = args.partition { |a| a.is_a? Hash }
      more_options << options
      build_command(args, **more_options.reduce(:deep_merge))
    end
    # Destructure options to pluck out env for merge
    def build_command(args, env: nil, **options)
      # Rely on native Ruby kwargs precedence rather than explicit Hash merges
      SSHKit::Command.new(*args, **default_command_options, **options, env: env_for(env))
    end
    def default_command_options
      { in: pwd_path, host: @host, user: @user, group: @group }
    end
    def env_for(env)
      @env.to_h.merge(env.to_h)
    end
  end
  prepend CommandEnvMerge
 end
 class SSHKit::Backend::Netssh::Configuration
  attr_accessor :max_concurrent_starts
 end
 class SSHKit::Backend::Netssh
  module LimitConcurrentStartsClass
    attr_reader :start_semaphore
    def configure(&block)
      super &block
      # Create this here to avoid lazy creation by multiple threads
      if config.max_concurrent_starts
        @start_semaphore = Concurrent::Semaphore.new(config.max_concurrent_starts)
      end
    end
  end
  class << self
    prepend LimitConcurrentStartsClass
  end
  module LimitConcurrentStartsInstance
    private
      def with_ssh(&block)
        host.ssh_options = self.class.config.ssh_options.merge(host.ssh_options || {})
        self.class.pool.with(
          method(:start_with_concurrency_limit),
          String(host.hostname),
          host.username,
          host.netssh_options,
          &block
        )
      end
      def start_with_concurrency_limit(*args)
        if self.class.start_semaphore
          self.class.start_semaphore.acquire do
            Net::SSH.start(*args)
          end
        else
          Net::SSH.start(*args)
        end
      end
  end
  prepend LimitConcurrentStartsInstance
 end
--- a/lib/kamal/tags.rb
+++ b/lib/kamal/tags.rb
@@ -1,39 +0,0 @@
 require "time"
 class Kamal::Tags
  attr_reader :config, :tags
  class << self
    def from_config(config, **extra)
      new(**default_tags(config), **extra)
    end
    def default_tags(config)
      { recorded_at: Time.now.utc.iso8601,
        performer: `whoami`.chomp,
        destination: config.destination,
        version: config.version,
        service_version: service_version(config) }
    end
    def service_version(config)
      [ config.service, config.abbreviated_version ].compact.join("@")
    end
  end
  def initialize(**tags)
    @tags = tags.compact
  end
  def env
    tags.transform_keys { |detail| "KAMAL_#{detail.upcase}" }
  end
  def to_s
    tags.values.map { |value| "[#{value}]" }.join(" ")
  end
  def except(*tags)
    self.class.new(**self.tags.except(*tags))
  end
 end
--- a/lib/kamal/utils.rb
+++ b/lib/kamal/utils.rb
@@ -1,100 +0,0 @@
 module Kamal::Utils
  extend self
  DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX = /\$(?!{[^\}]*\})/
  # Return a list of escaped shell arguments using the same named argument against the passed attributes (hash or array).
  def argumentize(argument, attributes, sensitive: false)
    Array(attributes).flat_map do |key, value|
      if value.present?
        attr = "#{key}=#{escape_shell_value(value)}"
        attr = self.sensitive(attr, redaction: "#{key}=[REDACTED]") if sensitive
        [ argument, attr]
      else
        [ argument, key ]
      end
    end
  end
  # Return a list of shell arguments using the same named argument against the passed attributes,
  # but redacts and expands secrets.
  def argumentize_env_with_secrets(env)
    if (secrets = env["secret"]).present?
      argumentize("-e", secrets.to_h { |key| [ key, ENV.fetch(key) ] }, sensitive: true) + argumentize("-e", env["clear"])
    else
      argumentize "-e", env.fetch("clear", env)
    end
  end
  # Returns a list of shell-dashed option arguments. If the value is true, it's treated like a value-less option.
  def optionize(args, with: nil)
    options = if with
      flatten_args(args).collect { |(key, value)| value == true ? "--#{key}" : "--#{key}#{with}#{escape_shell_value(value)}" }
    else
      flatten_args(args).collect { |(key, value)| [ "--#{key}", value == true ? nil : escape_shell_value(value) ] }
    end
    options.flatten.compact
  end
  # Flattens a one-to-many structure into an array of two-element arrays each containing a key-value pair
  def flatten_args(args)
    args.flat_map { |key, value| value.try(:map) { |entry| [key, entry] } || [ [ key, value ] ] }
  end
  # Marks sensitive values for redaction in logs and human-visible output.
  # Pass `redaction:` to change the default `"[REDACTED]"` redaction, e.g.
  # `sensitive "#{arg}=#{secret}", redaction: "#{arg}=xxxx"
  def sensitive(...)
    Kamal::Utils::Sensitive.new(...)
  end
  def redacted(value)
    case
    when value.respond_to?(:redaction)
      value.redaction
    when value.respond_to?(:transform_values)
      value.transform_values { |value| redacted value }
    when value.respond_to?(:map)
      value.map { |element| redacted element }
    else
      value
    end
  end
  def unredacted(value)
    case
    when value.respond_to?(:unredacted)
      value.unredacted
    when value.respond_to?(:transform_values)
      value.transform_values { |value| unredacted value }
    when value.respond_to?(:map)
      value.map { |element| unredacted element }
    else
      value
    end
  end
  # Escape a value to make it safe for shell use.
  def escape_shell_value(value)
    value.to_s.dump
      .gsub(/`/, '\\\\`')
      .gsub(DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX, '\$')
  end
  # Abbreviate a git revhash for concise display
  def abbreviate_version(version)
    if version
      # Don't abbreviate <sha>_uncommitted_<etc>
      if version.include?("_")
        version
      else
        version[0...7]
      end
    end
  end
  def uncommitted_changes
    `git status --porcelain`.strip
  end
 end
--- a/lib/kamal/utils/healthcheck_poller.rb
+++ b/lib/kamal/utils/healthcheck_poller.rb
@@ -1,39 +0,0 @@
 class Kamal::Utils::HealthcheckPoller
  TRAEFIK_HEALTHY_DELAY = 2
  class HealthcheckError < StandardError; end
  class << self
    def wait_for_healthy(pause_after_ready: false, &block)
      attempt = 1
      max_attempts = KAMAL.config.healthcheck["max_attempts"]
      begin
        case status = block.call
        when "healthy"
          sleep TRAEFIK_HEALTHY_DELAY if pause_after_ready
        when "running" # No health check configured
          sleep KAMAL.config.readiness_delay if pause_after_ready
        else
          raise HealthcheckError, "container not ready (#{status})"
        end
      rescue HealthcheckError => e
        if attempt <= max_attempts
          info "#{e.message}, retrying in #{attempt}s (attempt #{attempt}/#{max_attempts})..."
          sleep attempt
          attempt += 1
          retry
        else
          raise
        end
      end
      info "Container is healthy!"
    end
    private
      def info(message)
        SSHKit.config.output.info(message)
      end
  end
 end
--- a/lib/kamal/utils/sensitive.rb
+++ b/lib/kamal/utils/sensitive.rb
@@ -1,19 +0,0 @@
 require "active_support/core_ext/module/delegation"
 class Kamal::Utils::Sensitive
  # So SSHKit knows to redact these values.
  include SSHKit::Redaction
  attr_reader :unredacted, :redaction
  delegate :to_s, to: :unredacted
  delegate :inspect, to: :redaction
  def initialize(value, redaction: "[REDACTED]")
    @unredacted, @redaction = value, redaction
  end
  # Sensitive values won't leak into YAML output.
  def encode_with(coder)
    coder.represent_scalar nil, redaction
  end
 end
--- a/lib/kamal/version.rb
+++ b/lib/kamal/version.rb
@@ -1,3 +0,0 @@
 module Kamal
  VERSION = "0.16.0"
 end
--- a/lib/kamal.rb
+++ b/lib/kamal.rb
@@ -1,10 +1,9 @@
-module Kamal
+module Mrsk
 end
 require "active_support"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/kamal/sshkit_with_ext.rb")
+loader.ignore("#{__dir__}/mrsk/sshkit_with_ext.rb")
 loader.setup
 loader.eager_load # We need all commands loaded.
--- a/lib/mrsk/cli.rb
+++ b/lib/mrsk/cli.rb
@@ -0,0 +1,5 @@
 module Mrsk::Cli
 end
 # SSHKit uses instance eval, so we need a global const for ergonomics
 MRSK = Mrsk::Commander.new
--- a/lib/mrsk/cli/accessory.rb
+++ b/lib/mrsk/cli/accessory.rb
@@ -0,0 +1,214 @@
 class Mrsk::Cli::Accessory < Mrsk::Cli::Base
  desc "boot [NAME]", "Boot accessory service on host (use NAME=all to boot all accessories)"
  def boot(name)
    if name == "all"
      MRSK.accessory_names.each { |accessory_name| boot(accessory_name) }
    else
      with_accessory(name) do |accessory|
        directories(name)
        upload(name)
        on(accessory.host) do
          execute *MRSK.auditor.record("accessory #{name} boot"), verbosity: :debug
          execute *accessory.run
        end
      end
    end
  end
  desc "upload [NAME]", "Upload accessory files to host"
  def upload(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} upload files"), verbosity: :debug
        accessory.files.each do |(local, remote)|
          accessory.ensure_local_file_present(local)
          execute *accessory.make_directory_for(remote)
          upload! local, remote
          execute :chmod, "755", remote
        end
      end
    end
  end
  desc "directories [NAME]", "Create accessory directories on host"
  def directories(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} create directories"), verbosity: :debug
        accessory.directories.keys.each do |host_path|
          execute *accessory.make_directory(host_path)
        end
      end
    end
  end
  desc "reboot [NAME]", "Reboot accessory on host (stop container, remove container, start new container)"
  def reboot(name)
    with_accessory(name) do |accessory|
      stop(name)
      remove_container(name)
      boot(name)
    end
  end
  desc "start [NAME]", "Start existing accessory on host"
  def start(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} start"), verbosity: :debug
        execute *accessory.start
      end
    end
  end
  desc "stop [NAME]", "Stop accessory on host"
  def stop(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} stop"), verbosity: :debug
        execute *accessory.stop, raise_on_non_zero_exit: false
      end
    end
  end
  desc "restart [NAME]", "Restart accessory on host"
  def restart(name)
    with_accessory(name) do
      stop(name)
      start(name)
    end
  end
  desc "details [NAME]", "Display details about accessory on host (use NAME=all to boot all accessories)"
  def details(name)
    if name == "all"
      MRSK.accessory_names.each { |accessory_name| details(accessory_name) }
    else
      with_accessory(name) do |accessory|
        on(accessory.host) { puts capture_with_info(*accessory.info) }
      end
    end
  end
  desc "exec [NAME] [CMD]", "Execute a custom command on servers"
  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
  def exec(name, cmd)
    with_accessory(name) do |accessory|
      case
      when options[:interactive] && options[:reuse]
        say "Launching interactive command with via SSH from existing container...", :magenta
        run_locally { exec accessory.execute_in_existing_container_over_ssh(cmd) }
      when options[:interactive]
        say "Launching interactive command via SSH from new container...", :magenta
        run_locally { exec accessory.execute_in_new_container_over_ssh(cmd) }
      when options[:reuse]
        say "Launching command from existing container...", :magenta
        on(accessory.host) do
          execute *MRSK.auditor.record("accessory #{name} cmd '#{cmd}'"), verbosity: :debug
          capture_with_info(*accessory.execute_in_existing_container(cmd))
        end
      else
        say "Launching command from new container...", :magenta
        on(accessory.host) do
          execute *MRSK.auditor.record("accessory #{name} cmd '#{cmd}'"), verbosity: :debug
          capture_with_info(*accessory.execute_in_new_container(cmd))
        end
      end
    end
  end
  desc "logs [NAME]", "Show log lines from accessory on host"
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
  def logs(name)
    with_accessory(name) do |accessory|
      grep = options[:grep]
      if options[:follow]
        run_locally do
          info "Following logs on #{accessory.host}..."
          info accessory.follow_logs(grep: grep)
          exec accessory.follow_logs(grep: grep)
        end
      else
        since = options[:since]
        lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
        on(accessory.host) do
          puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
        end
      end
    end
  end
  desc "remove [NAME]", "Remove accessory container and image from host (use NAME=all to boot all accessories)"
  def remove(name)
    if name == "all"
      MRSK.accessory_names.each { |accessory_name| remove(accessory_name) }
    else
      with_accessory(name) do
        stop(name)
        remove_container(name)
        remove_image(name)
        remove_service_directory(name)
      end
    end
  end
  desc "remove_container [NAME]", "Remove accessory container from host"
  def remove_container(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} remove container"), verbosity: :debug
        execute *accessory.remove_container
      end
    end
  end
  desc "remove_image [NAME]", "Remove accessory image from host"
  def remove_image(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} remove image"), verbosity: :debug
        execute *accessory.remove_image
      end
    end
  end
  desc "remove_service_directory [NAME]", "Remove accessory directory used for uploaded files and data directories from host"
  def remove_service_directory(name)
    with_accessory(name) do |accessory|
      on(accessory.host) do
        execute *MRSK.auditor.record("accessory #{name} remove service directory"), verbosity: :debug
        execute *accessory.remove_service_directory
      end
    end
  end
  private
    def with_accessory(name)
      if accessory = MRSK.accessory(name)
        yield accessory
      else
        error_on_missing_accessory(name)
      end
    end
    def error_on_missing_accessory(name)
      options = MRSK.accessory_names.presence
      error \
        "No accessory by the name of '#{name}'" +
        (options ? " (options: #{options.to_sentence})" : "")
    end
 end
--- a/lib/mrsk/cli/app.rb
+++ b/lib/mrsk/cli/app.rb
@@ -0,0 +1,195 @@
 class Mrsk::Cli::App < Mrsk::Cli::Base
  desc "boot", "Boot app on servers (or reboot app if already running)"
  def boot
    say "Get most recent version available as an image...", :magenta unless options[:version]
    using_version(options[:version] || most_recent_version_available) do |version|
      say "Start container with version #{version} (or reboot if already running)...", :magenta
      MRSK.config.roles.each do |role|
        on(role.hosts) do |host|
          execute *MRSK.auditor.record("app boot version #{version}"), verbosity: :debug
          begin
            execute *MRSK.app.stop, raise_on_non_zero_exit: false
            execute *MRSK.app.run(role: role.name)
          rescue SSHKit::Command::Failed => e
            if e.message =~ /already in use/
              error "Rebooting container with same version already deployed on #{host}"
              execute *MRSK.auditor.record("app rebooted with version #{version}"), verbosity: :debug
              execute *MRSK.app.remove_container(version: version)
              execute *MRSK.app.run(role: role.name)
            else
              raise
            end
          end
        end
      end
    end
  end
  desc "start", "Start existing app on servers (use --version=<git-hash> to designate specific version)"
  def start
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("app start version #{MRSK.version}"), verbosity: :debug
      execute *MRSK.app.start, raise_on_non_zero_exit: false
    end
  end
  desc "stop", "Stop app on servers"
  def stop
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("app stop"), verbosity: :debug
      execute *MRSK.app.stop, raise_on_non_zero_exit: false
    end
  end
  desc "details", "Display details about app containers"
  def details
    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.info) }
  end
  desc "exec [CMD]", "Execute a custom command on servers"
  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
  def exec(cmd)
    case
    when options[:interactive] && options[:reuse]
      say "Get current version of running container...", :magenta unless options[:version]
      using_version(options[:version] || current_running_version) do |version|
        say "Launching interactive command with version #{version} via SSH from existing container on #{MRSK.primary_host}...", :magenta
        run_locally { exec MRSK.app.execute_in_existing_container_over_ssh(cmd, host: MRSK.primary_host) }
      end
    when options[:interactive]
      say "Get most recent version available as an image...", :magenta unless options[:version]
      using_version(options[:version] || most_recent_version_available) do |version|
        say "Launching interactive command with version #{version} via SSH from new container on #{MRSK.primary_host}...", :magenta
        run_locally { exec MRSK.app.execute_in_new_container_over_ssh(cmd, host: MRSK.primary_host) }
      end
    when options[:reuse]
      say "Get current version of running container...", :magenta unless options[:version]
      using_version(options[:version] || current_running_version) do |version|
        say "Launching command with version #{version} from existing container...", :magenta
        on(MRSK.hosts) do |host|
          execute *MRSK.auditor.record("app cmd '#{cmd}' with version #{version}"), verbosity: :debug
          puts_by_host host, capture_with_info(*MRSK.app.execute_in_existing_container(cmd))
        end
      end
    else
      say "Get most recent version available as an image...", :magenta unless options[:version]
      using_version(options[:version] || most_recent_version_available) do |version|
        say "Launching command with version #{version} from new container...", :magenta
        on(MRSK.hosts) do |host|
          execute *MRSK.auditor.record("app cmd '#{cmd}' with version #{version}"), verbosity: :debug
          puts_by_host host, capture_with_info(*MRSK.app.execute_in_new_container(cmd))
        end
      end
    end
  end
  desc "containers", "List all the app containers currently on servers"
  def containers
    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_containers) }
  end
  desc "images", "List all the app images currently on servers"
  def images
    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.list_images) }
  end
  desc "logs", "Show lines from app on servers"
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
  def logs
    # FIXME: Catch when app containers aren't running
    grep = options[:grep]
    if options[:follow]
      run_locally do
        info "Following logs on #{MRSK.primary_host}..."
        info MRSK.app.follow_logs(host: MRSK.primary_host, grep: grep)
        exec MRSK.app.follow_logs(host: MRSK.primary_host, grep: grep)
      end
    else
      since = options[:since]
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
      on(MRSK.hosts) do |host|
        begin
          puts_by_host host, capture_with_info(*MRSK.app.logs(since: since, lines: lines, grep: grep))
        rescue SSHKit::Command::Failed
          puts_by_host host, "Nothing found"
        end
      end
    end
  end
  desc "remove", "Remove app containers and images from servers"
  def remove
    remove_containers
    remove_images
  end
  desc "remove_container [VERSION]", "Remove app container with given version from servers"
  def remove_container(version)
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("app remove container #{version}"), verbosity: :debug
      execute *MRSK.app.remove_container(version: version)
    end
  end
  desc "remove_containers", "Remove all app containers from servers"
  def remove_containers
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("app remove containers"), verbosity: :debug
      execute *MRSK.app.remove_containers
    end
  end
  desc "remove_images", "Remove all app images from servers"
  def remove_images
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("app remove images"), verbosity: :debug
      execute *MRSK.app.remove_images
    end
  end
  desc "current_version", "Shows the version currently running"
  def current_version
    on(MRSK.hosts) { |host| puts_by_host host, capture_with_info(*MRSK.app.current_running_version).strip }
  end
  private
    def using_version(new_version)
      if new_version
        begin
          old_version = MRSK.config.version
          MRSK.config.version = new_version
          yield new_version
        ensure
          MRSK.config.version = old_version
        end
      else
        yield MRSK.config.version
      end
    end
    def most_recent_version_available(host: MRSK.primary_host)
      version = nil
      on(host) { version = capture_with_info(*MRSK.app.most_recent_version_from_available_images).strip }
      version.presence
    end
    def current_running_version(host: MRSK.primary_host)
      version = nil
      on(host) { version = capture_with_info(*MRSK.app.current_running_version).strip }
      version.presence
    end
 end
--- a/lib/mrsk/cli/base.rb
+++ b/lib/mrsk/cli/base.rb
@@ -0,0 +1,67 @@
 require "thor"
 require "dotenv"
 require "mrsk/sshkit_with_ext"
 module Mrsk::Cli
  class Base < Thor
    include SSHKit::DSL
    def self.exit_on_failure?() true end
    class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
    class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
    class_option :version, desc: "Run commands against a specific app version"
    class_option :primary, type: :boolean, aliases: "-p", desc: "Run commands only on primary host instead of all"
    class_option :hosts, aliases: "-h", desc: "Run commands on these hosts instead of all (separate by comma)"
    class_option :roles, aliases: "-r", desc: "Run commands on these roles instead of all (separate by comma)"
    class_option :config_file, aliases: "-c", default: "config/deploy.yml", desc: "Path to config file (default: config/deploy.yml)"
    class_option :destination, aliases: "-d", desc: "Specify destination to be used for config file (west -> deploy.west.yml)"
    def initialize(*)
      super
      load_envs
      initialize_commander(options)
    end
    private
      def load_envs
        if destination = options[:destination]
          Dotenv.load(".env.#{destination}", ".env")
        else
          Dotenv.load(".env")
        end
      end
      def initialize_commander(options)
        MRSK.tap do |commander|
          commander.config_file = Pathname.new(File.expand_path(options[:config_file]))
          commander.destination = options[:destination]
          commander.version     = options[:version]
          commander.specific_hosts    = options[:hosts]&.split(",")
          commander.specific_roles    = options[:roles]&.split(",")
          commander.specific_primary! if options[:primary]
          if options[:verbose]
            ENV["VERBOSE"] = "1" # For backtraces via cli/start
            commander.verbosity = :debug
          end
          if options[:quiet]
            commander.verbosity = :error
          end
        end
      end
      def print_runtime
        started_at = Time.now
        yield
      ensure
        runtime = Time.now - started_at
        puts "  Finished all in #{sprintf("%.1f seconds", runtime)}"
      end
  end
 end
--- a/lib/mrsk/cli/build.rb
+++ b/lib/mrsk/cli/build.rb
@@ -0,0 +1,69 @@
 class Mrsk::Cli::Build < Mrsk::Cli::Base
  desc "deliver", "Deliver a newly built app image to servers"
  def deliver
    invoke :push
    invoke :pull
  end
  desc "push", "Build locally and push app image to registry"
  def push
    cli = self
    run_locally do
      begin
        MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
      rescue SSHKit::Command::Failed => e
        if e.message =~ /(no builder)|(no such file or directory)/
          error "Missing compatible builder, so creating a new one first"
          if cli.create
            MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
          end
        else
          raise
        end
      end
    end
  end
  desc "pull", "Pull app image from the registry onto servers"
  def pull
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("build pull image #{MRSK.version}"), verbosity: :debug
      execute *MRSK.builder.pull
    end
  end
  desc "create", "Create a local build setup"
  def create
    run_locally do
      begin
        debug "Using builder: #{MRSK.builder.name}"
        execute *MRSK.builder.create
      rescue SSHKit::Command::Failed => e
        if e.message =~ /stderr=(.*)/
          error "Couldn't create remote builder: #{$1}"
          false
        else
          raise
        end
      end
    end
  end
  desc "remove", "Remove local build setup"
  def remove
    run_locally do
      debug "Using builder: #{MRSK.builder.name}"
      execute *MRSK.builder.remove
    end
  end
  desc "details", "Show the name of the configured builder"
  def details
    run_locally do
      puts "Builder: #{MRSK.builder.name}"
      puts capture(*MRSK.builder.info)
    end
  end
 end
--- a/lib/mrsk/cli/main.rb
+++ b/lib/mrsk/cli/main.rb
@@ -0,0 +1,148 @@
 class Mrsk::Cli::Main < Mrsk::Cli::Base
  desc "setup", "Setup all accessories and deploy the app to servers"
  def setup
    print_runtime do
      invoke "mrsk:cli:server:bootstrap"
      invoke "mrsk:cli:accessory:boot", [ "all" ]
      deploy
    end
  end
  desc "deploy", "Deploy the app to servers"
  def deploy
    print_runtime do
      say "Ensure Docker is installed...", :magenta
      invoke "mrsk:cli:server:bootstrap"
      say "Log into image registry...", :magenta
      invoke "mrsk:cli:registry:login"
      say "Build and push app image...", :magenta
      invoke "mrsk:cli:build:deliver"
      say "Ensure Traefik is running...", :magenta
      invoke "mrsk:cli:traefik:boot"
      invoke "mrsk:cli:app:boot"
      say "Prune old containers and images...", :magenta
      invoke "mrsk:cli:prune:all"
    end
  end
  desc "redeploy", "Deploy new version of the app to servers (without bootstrapping servers, starting Traefik, pruning, and registry login)"
  def redeploy
    print_runtime do
      say "Build and push app image...", :magenta
      invoke "mrsk:cli:build:deliver"
      invoke "mrsk:cli:app:boot"
    end
  end
  desc "rollback [VERSION]", "Rollback the app to VERSION"
  def rollback(version)
    MRSK.version = version
    cli = self
    cli.say "Stop current version, then start version #{version}...", :magenta
    on(MRSK.hosts) do
      execute *MRSK.app.stop, raise_on_non_zero_exit: false
      execute *MRSK.app.start
    end
  end
  desc "details", "Display details about Traefik and app containers"
  def details
    invoke "mrsk:cli:traefik:details"
    invoke "mrsk:cli:app:details"
    invoke "mrsk:cli:accessory:details", [ "all" ]
  end
  desc "audit", "Show audit log from servers"
  def audit
    on(MRSK.hosts) do |host|
      puts_by_host host, capture_with_info(*MRSK.auditor.reveal)
    end
  end
  desc "config", "Show combined config"
  def config
    run_locally do
      puts MRSK.config.to_h.to_yaml
    end
  end
  desc "init", "Create config stub in config/deploy.yml and env stub in .env"
  option :bundle, type: :boolean, default: false, desc: "Add MRSK to the Gemfile and create a bin/mrsk binstub"
  def init
    require "fileutils"
    if (deploy_file = Pathname.new(File.expand_path("config/deploy.yml"))).exist?
      puts "Config file already exists in config/deploy.yml (remove first to create a new one)"
    else
      FileUtils.mkdir_p deploy_file.dirname
      FileUtils.cp_r Pathname.new(File.expand_path("templates/deploy.yml", __dir__)), deploy_file
      puts "Created configuration file in config/deploy.yml"
    end
    unless (deploy_file = Pathname.new(File.expand_path(".env"))).exist?
      FileUtils.cp_r Pathname.new(File.expand_path("templates/template.env", __dir__)), deploy_file
      puts "Created .env file"
    end
    if options[:bundle]
      if (binstub = Pathname.new(File.expand_path("bin/mrsk"))).exist?
        puts "Binstub already exists in bin/mrsk (remove first to create a new one)"
      else
        puts "Adding MRSK to Gemfile and bundle..."
        `bundle add mrsk`
        `bundle binstubs mrsk`
        puts "Created binstub file in bin/mrsk"
      end
    end
  end
  desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
  def envify
    if destination = options[:destination]
      File.write(".env.#{destination}", ERB.new(IO.read(Pathname.new(File.expand_path(".env.#{destination}.erb")))).result)
    else
      File.write(".env", ERB.new(IO.read(Pathname.new(File.expand_path(".env.erb")))).result)
    end
  end
  desc "remove", "Remove Traefik, app, and registry session from servers"
  def remove
    invoke "mrsk:cli:traefik:remove"
    invoke "mrsk:cli:app:remove"
    invoke "mrsk:cli:registry:logout"
  end
  desc "version", "Display the MRSK version"
  def version
    puts Mrsk::VERSION
  end
  desc "accessory", "Manage the accessories"
  subcommand "accessory", Mrsk::Cli::Accessory
  desc "app", "Manage the application"
  subcommand "app", Mrsk::Cli::App
  desc "build", "Build the application image"
  subcommand "build", Mrsk::Cli::Build
  desc "prune", "Prune old application images and containers"
  subcommand "prune", Mrsk::Cli::Prune
  desc "registry", "Login and out of the image registry"
  subcommand "registry", Mrsk::Cli::Registry
  desc "server", "Bootstrap servers with Docker"
  subcommand "server", Mrsk::Cli::Server
  desc "traefik", "Manage the Traefik load balancer"
  subcommand "traefik", Mrsk::Cli::Traefik
 end
--- a/lib/mrsk/cli/prune.rb
+++ b/lib/mrsk/cli/prune.rb
@@ -0,0 +1,23 @@
 class Mrsk::Cli::Prune < Mrsk::Cli::Base
  desc "all", "Prune unused images and stopped containers"
  def all
    invoke :containers
    invoke :images
  end
  desc "images", "Prune unused images older than 30 days"
  def images
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("prune images"), verbosity: :debug
      execute *MRSK.prune.images
    end
  end
  desc "containers", "Prune stopped containers for the service older than 3 days"
  def containers
    on(MRSK.hosts) do
      execute *MRSK.auditor.record("prune containers"), verbosity: :debug
      execute *MRSK.prune.containers
    end
  end
 end
--- a/lib/mrsk/cli/registry.rb
+++ b/lib/mrsk/cli/registry.rb
@@ -0,0 +1,16 @@
 class Mrsk::Cli::Registry < Mrsk::Cli::Base
  desc "login", "Login to the registry locally and remotely"
  def login
    run_locally    { execute *MRSK.registry.login }
    on(MRSK.hosts) { execute *MRSK.registry.login }
  rescue ArgumentError => e
    puts e.message
  end
  desc "logout", "Logout of the registry remotely"
  def logout
    on(MRSK.hosts) { execute *MRSK.registry.logout }
  rescue ArgumentError => e
    puts e.message
  end
 end
--- a/lib/mrsk/cli/server.rb
+++ b/lib/mrsk/cli/server.rb
@@ -0,0 +1,6 @@
 class Mrsk::Cli::Server < Mrsk::Cli::Base
  desc "bootstrap", "Ensure Docker is installed on the servers"
  def bootstrap
    on(MRSK.hosts + MRSK.accessory_hosts) { execute "which docker || (apt-get update -y && apt-get install docker.io -y)" }
  end
 end
--- a/lib/mrsk/cli/templates/deploy.yml
+++ b/lib/mrsk/cli/templates/deploy.yml
@@ -0,0 +1,17 @@
 # Name of your application. Used to uniquely configuring Traefik and app containers.
 # Your Dockerfile should set LABEL service=the-same-value to ensure image pruning works.
 service: my-app
 # Name of the container image.
 image: user/my-app
 # Deploy to these servers.
 servers:
  - 192.168.0.1
 # Credentials for your image host.
 registry:
  # Specify the registry server, if you're not using Docker Hub
  # server: registry.digitalocean.com / ghcr.io / ...
  username: my-user
  password: my-password-should-go-somewhere-safe
--- a/lib/mrsk/cli/templates/template.env
+++ b/lib/mrsk/cli/templates/template.env
@@ -0,0 +1,2 @@
 MRSK_REGISTRY_PASSWORD=change-this
 RAILS_MASTER_KEY=another-env
--- a/lib/mrsk/cli/traefik.rb
+++ b/lib/mrsk/cli/traefik.rb
@@ -0,0 +1,87 @@
 class Mrsk::Cli::Traefik < Mrsk::Cli::Base
  desc "boot", "Boot Traefik on servers"
  def boot
    on(MRSK.traefik_hosts) { execute *MRSK.traefik.run, raise_on_non_zero_exit: false }
  end
  desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
  def reboot
    invoke :stop
    invoke :remove_container
    invoke :boot
  end
  desc "start", "Start existing Traefik on servers"
  def start
    on(MRSK.traefik_hosts) do
      execute *MRSK.auditor.record("traefik start"), verbosity: :debug
      execute *MRSK.traefik.start, raise_on_non_zero_exit: false
    end
  end
  desc "stop", "Stop Traefik on servers"
  def stop
    on(MRSK.traefik_hosts) do
      execute *MRSK.auditor.record("traefik stop"), verbosity: :debug
      execute *MRSK.traefik.stop, raise_on_non_zero_exit: false
    end
  end
  desc "restart", "Restart Traefik on servers"
  def restart
    invoke :stop
    invoke :start
  end
  desc "details", "Display details about Traefik containers from servers"
  def details
    on(MRSK.traefik_hosts) { |host| puts_by_host host, capture_with_info(*MRSK.traefik.info), type: "Traefik" }
  end
  desc "logs", "Show log lines from Traefik on servers"
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
  def logs
    grep = options[:grep]
    if options[:follow]
      run_locally do
        info "Following logs on #{MRSK.primary_host}..."
        info MRSK.traefik.follow_logs(host: MRSK.primary_host, grep: grep)
        exec MRSK.traefik.follow_logs(host: MRSK.primary_host, grep: grep)
      end
    else
      since = options[:since]
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
      on(MRSK.traefik_hosts) do |host|
        puts_by_host host, capture(*MRSK.traefik.logs(since: since, lines: lines, grep: grep)), type: "Traefik"
      end
    end
  end
  desc "remove", "Remove Traefik container and image from servers"
  def remove
    invoke :stop
    invoke :remove_container
    invoke :remove_image
  end
  desc "remove_container", "Remove Traefik container from servers"
  def remove_container
    on(MRSK.traefik_hosts) do
      execute *MRSK.auditor.record("traefik remove container"), verbosity: :debug
      execute *MRSK.traefik.remove_container
    end
  end
  desc "remove_container", "Remove Traefik image from servers"
  def remove_image
    on(MRSK.traefik_hosts) do
      execute *MRSK.auditor.record("traefik remove image"), verbosity: :debug
      execute *MRSK.traefik.remove_image
    end
  end
 end
--- a/lib/mrsk/commander.rb
+++ b/lib/mrsk/commander.rb
@@ -0,0 +1,103 @@
 require "active_support/core_ext/enumerable"
 class Mrsk::Commander
  attr_accessor :config_file, :destination, :verbosity, :version
  def initialize(config_file: nil, destination: nil, verbosity: :info)
    @config_file, @destination, @verbosity = config_file, destination, verbosity
  end
  def config
    @config ||= \
      Mrsk::Configuration
        .create_from(config_file, destination: destination, version: cascading_version)
        .tap { |config| configure_sshkit_with(config) }
  end
  attr_accessor :specific_hosts
  def specific_primary!
    self.specific_hosts = [ config.primary_web_host ]
  end
  def specific_roles=(role_names)
    self.specific_hosts = config.roles.select { |r| role_names.include?(r.name) }.flat_map(&:hosts) if role_names.present?
  end
  def primary_host
    specific_hosts&.sole || config.primary_web_host
  end
  def hosts
    specific_hosts || config.all_hosts
  end
  def traefik_hosts
    specific_hosts || config.traefik_hosts
  end
  def accessory_hosts
    specific_hosts || config.accessories.collect(&:host)
  end
  def accessory_names
    config.accessories&.collect(&:name) || []
  end
  def app
    @app ||= Mrsk::Commands::App.new(config)
  end
  def builder
    @builder ||= Mrsk::Commands::Builder.new(config)
  end
  def traefik
    @traefik ||= Mrsk::Commands::Traefik.new(config)
  end
  def registry
    @registry ||= Mrsk::Commands::Registry.new(config)
  end
  def prune
    @prune ||= Mrsk::Commands::Prune.new(config)
  end
  def accessory(name)
    Mrsk::Commands::Accessory.new(config, name: name)
  end
  def auditor
    @auditor ||= Mrsk::Commands::Auditor.new(config)
  end
  def with_verbosity(level)
    old_level = SSHKit.config.output_verbosity
    SSHKit.config.output_verbosity = level
    yield
  ensure
    SSHKit.config.output_verbosity = old_level
  end
  # Test-induced damage!
  def reset
    @config = @config_file = @destination = @version = nil
    @app = @builder = @traefik = @registry = @prune = @auditor = nil
    @verbosity = :info
  end
  private
    def cascading_version
      version.presence || ENV["VERSION"] || `git rev-parse HEAD`.strip
    end
    # Lazy setup of SSHKit
    def configure_sshkit_with(config)
      SSHKit::Backend::Netssh.configure { |ssh| ssh.ssh_options = config.ssh_options }
      SSHKit.config.command_map[:docker] = "docker" # No need to use /usr/bin/env, just clogs up the logs
      SSHKit.config.output_verbosity = verbosity
    end
 end
--- a/lib/mrsk/commands.rb
+++ b/lib/mrsk/commands.rb
@@ -0,0 +1,2 @@
 module Mrsk::Commands
 end
--- a/lib/kamal/commands/accessory.rb
+++ b/lib/kamal/commands/accessory.rb
@@ -1,7 +1,6 @@
-class Kamal::Commands::Accessory < Kamal::Commands::Base
+class Mrsk::Commands::Accessory < Mrsk::Commands::Base
  attr_reader :accessory_config
-  delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
+  delegate :service_name, :image, :host, :port, :files, :directories, :env_args, :volume_args, :label_args, to: :accessory_config
           :publish_args, :env_args, :volume_args, :label_args, :option_args, to: :accessory_config
  def initialize(config, name:)
    super(config)
@@ -11,16 +10,13 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
  def run
    docker :run,
      "--name", service_name,
-      "--detach",
+      "-d",
      "--restart", "unless-stopped",
-      *config.logging_args,
+      "-p", port,
      *publish_args,
      *env_args,
      *volume_args,
      *label_args,
-      *option_args,
+      image
      image,
      cmd
  end
  def start
@@ -38,14 +34,14 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
  def logs(since: nil, lines: nil, grep: nil)
    pipe \
-      docker(:logs, service_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
+      docker(:logs, service_name, (" --since #{since}" if since), (" -n #{lines}" if lines), "-t", "2>&1"),
      ("grep '#{grep}'" if grep)
  end
  def follow_logs(grep: nil)
    run_over_ssh \
      pipe \
-        docker(:logs, service_name, "--timestamps", "--tail", "10", "--follow", "2>&1"),
+        docker(:logs, service_name, "-t", "-n", "10", "-f", "2>&1"),
        (%(grep "#{grep}") if grep)
  end
@@ -76,7 +72,7 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
  end
  def run_over_ssh(command)
-    super command, host: hosts.first
+    super command, host: host
  end
@@ -99,11 +95,11 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
  end
  def remove_container
-    docker :container, :prune, "--force", *service_filter
+    docker :container, :prune, "-f", *service_filter
  end
  def remove_image
-    docker :image, :rm, "--force", image
+    docker :image, :prune, "-a", "-f", *service_filter
  end
  private
--- a/lib/mrsk/commands/app.rb
+++ b/lib/mrsk/commands/app.rb
@@ -0,0 +1,131 @@
 class Mrsk::Commands::App < Mrsk::Commands::Base
  def run(role: :web)
    role = config.role(role)
    docker :run,
      "-d",
      "--restart unless-stopped",
      "--name", service_with_version,
      *role.env_args,
      *config.volume_args,
      *role.label_args,
      config.absolute_image,
      role.cmd
  end
  def start
    docker :start, service_with_version
  end
  def stop
    pipe current_container_id, xargs(docker(:stop))
  end
  def info
    docker :ps, *service_filter
  end
  def logs(since: nil, lines: nil, grep: nil)
    pipe \
      current_container_id,
      "xargs docker logs#{" --since #{since}" if since}#{" -n #{lines}" if lines} 2>&1",
      ("grep '#{grep}'" if grep)
  end
  def follow_logs(host:, grep: nil)
    run_over_ssh \
      pipe(
        current_container_id,
        "xargs docker logs -t -n 10 -f 2>&1",
        (%(grep "#{grep}") if grep)
      ),
      host: host
  end
  def execute_in_existing_container(*command, interactive: false)
    docker :exec,
      ("-it" if interactive),
      config.service_with_version,
      *command
  end
  def execute_in_new_container(*command, interactive: false)
    docker :run,
      ("-it" if interactive),
      "--rm",
      *config.env_args,
      *config.volume_args,
      config.absolute_image,
      *command
  end
  def execute_in_existing_container_over_ssh(*command, host:)
    run_over_ssh execute_in_existing_container(*command, interactive: true), host: host
  end
  def execute_in_new_container_over_ssh(*command, host:)
    run_over_ssh execute_in_new_container(*command, interactive: true), host: host
  end
  def current_container_id
    docker :ps, "-q", *service_filter
  end
  def container_id_for(container_name:)
    docker :container, :ls, "-a", "-f", "name=#{container_name}", "-q"
  end
  def current_running_version
    # FIXME: Find more graceful way to extract the version from "app-version" than using sed and tail!
    pipe \
      docker(:ps, "--filter", "label=service=#{config.service}", "--format", '"{{.Names}}"'),
      %(sed 's/-/\\n/g'),
      "tail -n 1"
  end
  def most_recent_version_from_available_images
    pipe \
      docker(:image, :ls, "--format", '"{{.Tag}}"', config.repository),
      "head -n 1"
  end
  def list_containers
    docker :container, :ls, "-a", *service_filter
  end
  def remove_container(version:)
    pipe \
      container_id_for(container_name: service_with_version(version)),
      xargs(docker(:container, :rm))
  end
  def remove_containers
    docker :container, :prune, "-f", *service_filter
  end
  def list_images
    docker :image, :ls, config.repository
  end
  def remove_images
    docker :image, :prune, "-a", "-f", *service_filter
  end
  private
    def service_with_version(version = nil)
      if version
        "#{config.service}-#{version}"
      else
        config.service_with_version
      end
    end
    def service_filter
      [ "--filter", "label=service=#{config.service}" ]
    end
 end
--- a/lib/mrsk/commands/auditor.rb
+++ b/lib/mrsk/commands/auditor.rb
@@ -0,0 +1,34 @@
 require "active_support/core_ext/time/conversions"
 class Mrsk::Commands::Auditor < Mrsk::Commands::Base
  def record(line)
    append \
      [ :echo, tagged_line(line) ],
      audit_log_file
  end
  def reveal
    [ :tail, "-n", 50, audit_log_file ]
  end
  private
    def audit_log_file
      "mrsk-#{config.service}-audit.log"
    end
    def tagged_line(line)
      "'#{tags} #{line}'"
    end
    def tags
      "[#{timestamp}] [#{performer}]"
    end
    def performer
      `whoami`.strip
    end
    def timestamp
      Time.now.to_fs(:db)
    end
 end
--- a/lib/mrsk/commands/base.rb
+++ b/lib/mrsk/commands/base.rb
@@ -0,0 +1,46 @@
 module Mrsk::Commands
  class Base
    delegate :redact, to: Mrsk::Utils
    attr_accessor :config
    def initialize(config)
      @config = config
    end
    def run_over_ssh(*command, host:)
      "ssh".tap do |cmd|
        cmd << " -J #{config.ssh_proxy.jump_proxies}" if config.ssh_proxy
        cmd << " -t #{config.ssh_user}@#{host} '#{command.join(" ")}'"
      end
    end
    private
      def combine(*commands, by: "&&")
        commands
          .compact
          .collect { |command| Array(command) + [ by ] }.flatten # Join commands
          .tap     { |commands| commands.pop } # Remove trailing combiner
      end
      def chain(*commands)
        combine *commands, by: ";"
      end
      def pipe(*commands)
        combine *commands, by: "|"
      end
      def append(*commands)
        combine *commands, by: ">>"
      end
      def xargs(command)
        [ :xargs, command ].flatten
      end
      def docker(*args)
        args.compact.unshift :docker
      end
  end
 end
--- a/lib/mrsk/commands/builder.rb
+++ b/lib/mrsk/commands/builder.rb
@@ -0,0 +1,36 @@
 class Mrsk::Commands::Builder < Mrsk::Commands::Base
  delegate :create, :remove, :push, :pull, :info, to: :target
  def name
    target.class.to_s.remove("Mrsk::Commands::Builder::").underscore
  end
  def target
    case
    when config.builder && config.builder["multiarch"] == false
      native
    when config.builder && config.builder["local"] && config.builder["remote"]
      multiarch_remote
    when config.builder && config.builder["remote"]
      native_remote
    else
      multiarch
    end
  end
  def native
    @native ||= Mrsk::Commands::Builder::Native.new(config)
  end
  def native_remote
    @native ||= Mrsk::Commands::Builder::Native::Remote.new(config)
  end
  def multiarch
    @multiarch ||= Mrsk::Commands::Builder::Multiarch.new(config)
  end
  def multiarch_remote
    @multiarch_remote ||= Mrsk::Commands::Builder::Multiarch::Remote.new(config)
  end
 end
--- a/lib/mrsk/commands/builder/base.rb
+++ b/lib/mrsk/commands/builder/base.rb
@@ -0,0 +1,24 @@
 class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
  delegate :argumentize, to: Mrsk::Utils
  def pull
    docker :pull, config.absolute_image
  end
  def build_args
    argumentize "--build-arg", args, redacted: true
  end
  def build_secrets
    argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
  end
  private
    def args
      (config.builder && config.builder["args"]) || {}
    end
    def secrets
      (config.builder && config.builder["secrets"]) || []
    end
 end
--- a/lib/kamal/commands/builder/multiarch.rb
+++ b/lib/kamal/commands/builder/multiarch.rb
@@ -1,4 +1,4 @@
-class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
+class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
  def create
    docker :buildx, :create, "--use", "--name", builder_name
  end
@@ -12,8 +12,10 @@ class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
      "--push",
      "--platform", "linux/amd64,linux/arm64",
      "--builder", builder_name,
-      *build_options,
+      "-t", config.absolute_image,
-      build_context
+      *build_args,
      *build_secrets,
      "."
  end
  def info
@@ -24,6 +26,6 @@ class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
  private
    def builder_name
-      "kamal-#{config.service}-multiarch"
+      "mrsk-#{config.service}-multiarch"
    end
 end
--- a/lib/kamal/commands/builder/multiarch/remote.rb
+++ b/lib/kamal/commands/builder/multiarch/remote.rb
@@ -1,4 +1,4 @@
-class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Multiarch
+class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Multiarch
  def create
    combine \
      create_contexts,
@@ -22,17 +22,17 @@ class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Mu
    end
    def create_local_buildx
-      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local_arch), "--platform", "linux/#{local_arch}"
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local["arch"]), "--platform", "linux/#{local["arch"]}"
    end
    def append_remote_buildx
-      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote_arch), "--platform", "linux/#{remote_arch}"
+      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote["arch"]), "--platform", "linux/#{remote["arch"]}"
    end
    def create_contexts
      combine \
-        create_context(local_arch, local_host),
+        create_context(local["arch"], local["host"]),
-        create_context(remote_arch, remote_host)
+        create_context(remote["arch"], remote["host"])
    end
    def create_context(arch, host)
@@ -41,11 +41,19 @@ class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Mu
    def remove_contexts
      combine \
-        remove_context(local_arch),
+        remove_context(local["arch"]),
-        remove_context(remote_arch)
+        remove_context(remote["arch"])
    end
    def remove_context(arch)
      docker :context, :rm, builder_name_with_arch(arch)
    end
    def local
      config.builder["local"]
    end
    def remote
      config.builder["remote"]
    end
 end
--- a/lib/mrsk/commands/builder/native.rb
+++ b/lib/mrsk/commands/builder/native.rb
@@ -0,0 +1,19 @@
 class Mrsk::Commands::Builder::Native < Mrsk::Commands::Builder::Base
  def create
    # No-op on native
  end
  def remove
    # No-op on native
  end
  def push
    combine \
      docker(:build, "-t", *build_args, *build_secrets, config.absolute_image, "."),
      docker(:push, config.absolute_image)
  end
  def info
    # No-op on native
  end
 end
--- a/lib/kamal/commands/builder/native/remote.rb
+++ b/lib/kamal/commands/builder/native/remote.rb
@@ -1,4 +1,4 @@
-class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Native
+class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
  def create
    chain \
      create_context,
@@ -16,8 +16,10 @@ class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Nativ
      "--push",
      "--platform", platform,
      "--builder", builder_name,
-      *build_options,
+      "-t", config.absolute_image,
-      build_context
+      *build_args,
      *build_secrets,
      "."
  end
  def info
@@ -28,21 +30,29 @@ class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Nativ
  private
    def arch
      config.builder["remote"]["arch"]
    end
    def host
      config.builder["remote"]["host"]
    end
    def builder_name
-      "kamal-#{config.service}-native-remote"
+      "mrsk-#{config.service}-native-remote"
    end
    def builder_name_with_arch
-      "#{builder_name}-#{remote_arch}"
+      "#{builder_name}-#{arch}"
    end
    def platform
-      "linux/#{remote_arch}"
+      "linux/#{arch}"
    end
    def create_context
      docker :context, :create,
-        builder_name_with_arch, "--description", "'#{builder_name} #{remote_arch} native host'", "--docker", "'host=#{remote_host}'"
+        builder_name_with_arch, "--description", "'#{builder_name} #{arch} native host'", "--docker", "'host=#{host}'"
    end
    def remove_context
--- a/lib/mrsk/commands/prune.rb
+++ b/lib/mrsk/commands/prune.rb
@@ -0,0 +1,16 @@
 require "active_support/duration"
 require "active_support/core_ext/numeric/time"
 class Mrsk::Commands::Prune < Mrsk::Commands::Base
  PRUNE_IMAGES_AFTER     = 30.days.in_hours.to_i
  PRUNE_CONTAINERS_AFTER =  3.days.in_hours.to_i
  def images
    docker :image, :prune, "-f", "--filter", "until=#{PRUNE_IMAGES_AFTER}h"
  end
  def containers
    docker :image, :prune, "-f", "--filter", "until=#{PRUNE_IMAGES_AFTER}h"
    docker :container, :prune, "-f", "--filter", "label=service=#{config.service}", "--filter", "'until=#{PRUNE_CONTAINERS_AFTER}h'"
  end
 end
--- a/lib/mrsk/commands/registry.rb
+++ b/lib/mrsk/commands/registry.rb
@@ -0,0 +1,11 @@
 class Mrsk::Commands::Registry < Mrsk::Commands::Base
  delegate :registry, to: :config
  def login
    docker :login, registry["server"], "-u", redact(registry["username"]), "-p", redact(registry["password"])
  end
  def logout
    docker :logout, registry["server"]
  end
 end
--- a/lib/mrsk/commands/traefik.rb
+++ b/lib/mrsk/commands/traefik.rb
@@ -0,0 +1,51 @@
 class Mrsk::Commands::Traefik < Mrsk::Commands::Base
  def run
    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",
      *cmd_args
  end
  def start
    docker :container, :start, "traefik"
  end
  def stop
    docker :container, :stop, "traefik"
  end
  def info
    docker :ps, "--filter", "name=traefik"
  end
  def logs(since: nil, lines: nil, grep: nil)
    pipe \
      docker(:logs, "traefik", (" --since #{since}" if since), (" -n #{lines}" if lines), "-t", "2>&1"),
      ("grep '#{grep}'" if grep)
  end
  def follow_logs(host:, grep: nil)
    run_over_ssh pipe(
      docker(:logs, "traefik", "-t", "-n", "10", "-f", "2>&1"),
      (%(grep "#{grep}") if grep)
    ).join(" "), host: host
  end
  def remove_container
    docker :container, :prune, "-f", "--filter", "label=org.opencontainers.image.title=Traefik"
  end
  def remove_image
    docker :image, :prune, "-a", "-f", "--filter", "label=org.opencontainers.image.title=Traefik"
  end
  private
    def cmd_args
      (config.raw_config.dig(:traefik, "args") || { }).collect { |(key, value)| [ "--#{key}", value ] }.flatten
    end
 end
--- a/lib/mrsk/configuration.rb
+++ b/lib/mrsk/configuration.rb
@@ -0,0 +1,178 @@
 require "active_support/ordered_options"
 require "active_support/core_ext/string/inquiry"
 require "active_support/core_ext/module/delegation"
 require "pathname"
 require "erb"
 require "net/ssh/proxy/jump"
 class Mrsk::Configuration
  delegate :service, :image, :servers, :env, :labels, :registry, :builder, to: :raw_config, allow_nil: true
  delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
  attr_accessor :version
  attr_accessor :raw_config
  class << self
    def create_from(base_config_file, destination: nil, version: "missing")
      new(load_config_file(base_config_file).tap do |config|
        if destination
          config.deep_merge! \
            load_config_file destination_config_file(base_config_file, destination)
        end
      end, version: version)
    end
    private
      def load_config_file(file)
        if file.exist?
          YAML.load(ERB.new(IO.read(file)).result).symbolize_keys
        else
          raise "Configuration file not found in #{file}"
        end
      end
      def destination_config_file(base_config_file, destination)
        dir, basename = base_config_file.split
        dir.join basename.to_s.remove(".yml") + ".#{destination}.yml"
      end
  end
  def initialize(raw_config, version: "missing", validate: true)
    @raw_config = ActiveSupport::InheritableOptions.new(raw_config)
    @version = version
    valid? if validate
  end
  def roles
    @roles ||= role_names.collect { |role_name| Role.new(role_name, config: self) }
  end
  def role(name)
    roles.detect { |r| r.name == name.to_s }
  end
  def accessories
    @accessories ||= raw_config.accessories&.keys&.collect { |name| Mrsk::Configuration::Accessory.new(name, config: self) } || []
  end
  def accessory(name)
    accessories.detect { |a| a.name == name.to_s }
  end
  def all_hosts
    roles.flat_map(&:hosts)
  end
  def primary_web_host
    role(:web).hosts.first
  end
  def traefik_hosts
    roles.select(&:running_traefik?).flat_map(&:hosts)
  end
  def repository
    [ raw_config.registry["server"], image ].compact.join("/")
  end
  def absolute_image
    "#{repository}:#{version}"
  end
  def service_with_version
    "#{service}-#{version}"
  end
  def env_args
    if raw_config.env.present?
      argumentize_env_with_secrets(raw_config.env)
    else
      []
    end
  end
  def volume_args
    if raw_config.volumes.present?
      argumentize "--volume", raw_config.volumes
    else
      []
    end
  end
  def ssh_user
    if raw_config.ssh.present?
      raw_config.ssh["user"] || "root"
    else
      "root"
    end
  end
  def ssh_proxy
    if raw_config.ssh.present? && raw_config.ssh["proxy"]
      Net::SSH::Proxy::Jump.new \
        raw_config.ssh["proxy"].include?("@") ? raw_config.ssh["proxy"] : "root@#{raw_config.ssh["proxy"]}"
    end
  end
  def ssh_options
    { user: ssh_user, proxy: ssh_proxy, auth_methods: [ "publickey" ] }.compact
  end
  def valid?
    ensure_required_keys_present && ensure_env_available
  end
  def to_h
    {
      roles: role_names,
      hosts: all_hosts,
      primary_host: primary_web_host,
      version: version,
      repository: repository,
      absolute_image: absolute_image,
      service_with_version: service_with_version,
      env_args: env_args,
      volume_args: volume_args,
      ssh_options: ssh_options,
      builder: raw_config.builder,
      accessories: raw_config.accessories
    }.compact
  end
  private
    # Will raise ArgumentError if any required config keys are missing
    def ensure_required_keys_present
      %i[ service image registry servers ].each do |key|
        raise ArgumentError, "Missing required configuration for #{key}" unless raw_config[key].present?
      end
      if raw_config.registry["username"].blank?
        raise ArgumentError, "You must specify a username for the registry in config/deploy.yml"
      end
      if raw_config.registry["password"].blank?
        raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
      end
      true
    end
    # Will raise KeyError if any secret ENVs are missing
    def ensure_env_available
      env_args
      roles.each(&:env_args)
      true
    end
    def role_names
      raw_config.servers.is_a?(Array) ? [ "web" ] : raw_config.servers.keys.sort
    end
 end
--- a/lib/kamal/configuration/accessory.rb
+++ b/lib/kamal/configuration/accessory.rb
@@ -1,5 +1,5 @@
-class Kamal::Configuration::Accessory
+class Mrsk::Configuration::Accessory
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
+  delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
  attr_accessor :name, :specifics
@@ -15,24 +15,18 @@ class Kamal::Configuration::Accessory
    specifics["image"]
  end
-  def hosts
+  def host
-    if (specifics.keys & ["host", "hosts", "roles"]).size != 1
+    specifics["host"] || raise(ArgumentError, "Missing host for accessory")
      raise ArgumentError, "Specify one of `host`, `hosts` or `roles` for accessory `#{name}`"
    end
    hosts_from_host || hosts_from_hosts || hosts_from_roles
  end
  def port
-    if port = specifics["port"]&.to_s
+    if specifics["port"].to_s.include?(":")
-      port.include?(":") ? port : "#{port}:#{port}"
+      specifics["port"]
    else
      "#{specifics["port"]}:#{specifics["port"]}"
    end
  end
  def publish_args
    argumentize "--publish", port if port
  end
  def labels
    default_labels.merge(specifics["labels"] || {})
  end
@@ -71,18 +65,6 @@ class Kamal::Configuration::Accessory
    argumentize "--volume", volumes
  end
  def option_args
    if args = specifics["options"]
      optionize args
    else
      []
    end
  end
  def cmd
    specifics["cmd"]
  end
  private
    attr_accessor :config
@@ -138,32 +120,4 @@ class Kamal::Configuration::Accessory
    def service_data_directory
      "$PWD/#{service_name}"
    end
    def hosts_from_host
      if specifics.key?("host")
        host = specifics["host"]
        if host
          [host]
        else
          raise ArgumentError, "Missing host for accessory `#{name}`"
        end
      end
    end
    def hosts_from_hosts
      if specifics.key?("hosts")
        hosts = specifics["hosts"]
        if hosts.is_a?(Array)
          hosts
        else
          raise ArgumentError, "Hosts should be an Array for accessory `#{name}`"
        end
      end
    end
    def hosts_from_roles
      if specifics.key?("roles")
        specifics["roles"].flat_map { |role| config.role(role).hosts }
      end
    end
 end
--- a/lib/kamal/configuration/role.rb
+++ b/lib/kamal/configuration/role.rb
@@ -1,5 +1,5 @@
-class Kamal::Configuration::Role
+class Mrsk::Configuration::Role
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Kamal::Utils
+  delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
  attr_accessor :name
@@ -7,10 +7,6 @@ class Kamal::Configuration::Role
   @name, @config = name.inquiry, config
  end
  def primary_host
    hosts.first
  end
  def hosts
    @hosts ||= extract_hosts_from_config
  end
@@ -35,40 +31,10 @@ class Kamal::Configuration::Role
    argumentize_env_with_secrets env
  end
  def health_check_args
    if health_check_cmd.present?
      optionize({ "health-cmd" => health_check_cmd, "health-interval" => health_check_interval })
    else
      []
    end
  end
  def health_check_cmd
    options = specializations["healthcheck"] || {}
    options = config.healthcheck.merge(options) if running_traefik?
    options["cmd"] || http_health_check(port: options["port"], path: options["path"])
  end
  def health_check_interval
    options = specializations["healthcheck"] || {}
    options = config.healthcheck.merge(options) if running_traefik?
    options["interval"] || "1s"
  end
  def cmd
    specializations["cmd"]
  end
  def option_args
    if args = specializations["options"]
      optionize args
    else
      []
    end
  end
  def running_traefik?
    name.web? || specializations["traefik"]
  end
@@ -81,38 +47,28 @@ class Kamal::Configuration::Role
        config.servers
      else
        servers = config.servers[name]
-        servers.is_a?(Array) ? servers : Array(servers["hosts"])
+        servers.is_a?(Array) ? servers : servers["hosts"]
      end
    end
    def default_labels
-      if config.destination
+      { "service" => config.service, "role" => name }
        { "service" => config.service, "role" => name, "destination" => config.destination }
      else
        { "service" => config.service, "role" => name }
      end
    end
    def traefik_labels
      if running_traefik?
        {
-          # Setting a service property ensures that the generated service name will be consistent between versions
+          "traefik.http.routers.#{config.service}.rule" => "'PathPrefix(`/`)'",
-          "traefik.http.services.#{traefik_service}.loadbalancer.server.scheme" => "http",
+          "traefik.http.services.#{config.service}.loadbalancer.healthcheck.path" => "/up",
-
+          "traefik.http.services.#{config.service}.loadbalancer.healthcheck.interval" => "1s",
-          "traefik.http.routers.#{traefik_service}.rule" => "PathPrefix(`/`)",
+          "traefik.http.middlewares.#{config.service}.retry.attempts" => "3",
-          "traefik.http.middlewares.#{traefik_service}-retry.retry.attempts" => "5",
+          "traefik.http.middlewares.#{config.service}.retry.initialinterval" => "500ms"
          "traefik.http.middlewares.#{traefik_service}-retry.retry.initialinterval" => "500ms",
          "traefik.http.routers.#{traefik_service}.middlewares" => "#{traefik_service}-retry@docker"
        }
      else
        {}
      end
    end
    def traefik_service
      [ config.service, name, config.destination ].compact.join("-")
    end
    def custom_labels
      Hash.new.tap do |labels|
        labels.merge!(config.labels) if config.labels.present?
@@ -148,8 +104,4 @@ class Kamal::Configuration::Role
        new_env["clear"] = (clear_app_env + clear_role_env).uniq
      end
    end
    def http_health_check(port:, path:)
      "curl -f #{URI.join("http://localhost:#{port}", path)} || exit 1" if path.present? || port.present?
    end
 end
--- a/lib/mrsk/sshkit_with_ext.rb
+++ b/lib/mrsk/sshkit_with_ext.rb
@@ -0,0 +1,12 @@
 require "sshkit"
 require "sshkit/dsl"
 class SSHKit::Backend::Abstract
  def capture_with_info(*args)
    capture(*args, verbosity: Logger::INFO)
  end
  def puts_by_host(host, output, type: "App")
    puts "#{type} Host: #{host}\n#{output}\n\n"
  end
 end
--- a/lib/mrsk/utils.rb
+++ b/lib/mrsk/utils.rb
@@ -0,0 +1,29 @@
 module Mrsk::Utils
  extend self
  # Return a list of shell arguments using the same named argument against the passed attributes (hash or array).
  def argumentize(argument, attributes, redacted: false)
    Array(attributes).flat_map do |k, v|
      if v.present?
        [ argument, redacted ? redact("#{k}=#{v}") : "#{k}=#{v}" ]
      else
        [ argument, k ]
      end
    end
  end
  # Return a list of shell arguments using the same named argument against the passed attributes,
  # but redacts and expands secrets.
  def argumentize_env_with_secrets(env)
    if (secrets = env["secret"]).present?
      argumentize("-e", secrets.to_h { |key| [ key, ENV.fetch(key) ] }, redacted: true) + argumentize("-e", env["clear"])
    else
      argumentize "-e", env.fetch("clear", env)
    end
  end
  # Copied from SSHKit::Backend::Abstract#redact to be available inside Commands classes
  def redact(arg) # Used in execute_command to hide redact() args a user passes in
    arg.to_s.extend(SSHKit::Redaction) # to_s due to our inability to extend Integer, etc
  end
 end
--- a/lib/mrsk/version.rb
+++ b/lib/mrsk/version.rb
@@ -0,0 +1,3 @@
 module Mrsk
  VERSION = "0.6.1"
 end
--- a/mrsk.gemspec
+++ b/mrsk.gemspec
@@ -0,0 +1,20 @@
 require_relative "lib/mrsk/version"
 Gem::Specification.new do |spec|
  spec.name        = "mrsk"
  spec.version     = Mrsk::VERSION
  spec.authors     = [ "David Heinemeier Hansson" ]
  spec.email       = "dhh@hey.com"
  spec.homepage    = "https://github.com/rails/mrsk"
  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"]
  spec.executables = %w[ mrsk ]
  spec.add_dependency "activesupport", ">= 7.0"
  spec.add_dependency "sshkit", "~> 1.21"
  spec.add_dependency "thor", "~> 1.2"
  spec.add_dependency "dotenv", "~> 2.8"
  spec.add_dependency "zeitwerk", "~> 2.5"
 end
--- a/test/cli/accessory_test.rb
+++ b/test/cli/accessory_test.rb
@@ -1,143 +1,38 @@
 require_relative "cli_test_case"
 class CliAccessoryTest < CliTestCase
  test "boot" do
    Kamal::Cli::Accessory.any_instance.expects(:directories).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:upload).with("mysql")
    run_command("boot", "mysql").tap do |output|
      assert_match /docker login.*on 1.1.1.3/, output
      assert_match "docker run --name app-mysql --detach --restart unless-stopped --log-opt max-size=\"10m\" --publish 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", output
    end
  end
  test "boot all" do
    Kamal::Cli::Accessory.any_instance.expects(:directories).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:upload).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:directories).with("redis")
    Kamal::Cli::Accessory.any_instance.expects(:upload).with("redis")
    run_command("boot", "all").tap do |output|
      assert_match /docker login.*on 1.1.1.3/, output
      assert_match /docker login.*on 1.1.1.1/, output
      assert_match /docker login.*on 1.1.1.2/, output
      assert_match "docker run --name app-mysql --detach --restart unless-stopped --log-opt max-size=\"10m\" --publish 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", output
      assert_match "docker run --name app-redis --detach --restart unless-stopped --log-opt max-size=\"10m\" --publish 6379:6379 --volume $PWD/app-redis/data:/data --label service=\"app-redis\" redis:latest on 1.1.1.1", output
      assert_match "docker run --name app-redis --detach --restart unless-stopped --log-opt max-size=\"10m\" --publish 6379:6379 --volume $PWD/app-redis/data:/data --label service=\"app-redis\" redis:latest on 1.1.1.2", output
    end
  end
  test "upload" do
-    run_command("upload", "mysql").tap do |output|
+    assert_match "test/fixtures/files/my.cnf app-mysql/etc/mysql/my.cnf", run_command("upload", "mysql")
      assert_match "mkdir -p app-mysql/etc/mysql", output
      assert_match "test/fixtures/files/my.cnf app-mysql/etc/mysql/my.cnf", output
      assert_match "chmod 755 app-mysql/etc/mysql/my.cnf", output
    end
  end
  test "directories" do
    assert_match "mkdir -p $PWD/app-mysql/data", run_command("directories", "mysql")
  end
-  test "reboot" do
+  test "remove service direcotry" do
-    Kamal::Commands::Registry.any_instance.expects(:login)
+    assert_match "rm -rf app-mysql", run_command("remove_service_directory", "mysql")
    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:boot).with("mysql", login: false)
    run_command("reboot", "mysql")
  end
-  test "start" do
+  test "boot" do
-    assert_match "docker container start app-mysql", run_command("start", "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 "stop" do
    assert_match "docker container stop app-mysql", run_command("stop", "mysql")
  end
  test "restart" do
    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:start).with("mysql")
    run_command("restart", "mysql")
  end
  test "details" do
    assert_match "docker ps --filter label=service=app-mysql", run_command("details", "mysql")
  end
  test "details with all" do
    run_command("details", "all").tap do |output|
      assert_match "docker ps --filter label=service=app-mysql", output
      assert_match "docker ps --filter label=service=app-redis", output
    end
  end
  test "exec" do
    run_command("exec", "mysql", "mysql -v").tap do |output|
-      assert_match "Launching command from new container", output
+      assert_match /Launching command from new container/, output
-      assert_match "mysql -v", output
+      assert_match /mysql -v/, output
    end
  end
  test "exec with reuse" do
    run_command("exec", "mysql", "--reuse", "mysql -v").tap do |output|
-      assert_match "Launching command from existing container", output
+      assert_match /Launching command from existing container/, output
-      assert_match "docker exec app-mysql mysql -v", output
+      assert_match %r[docker exec app-mysql mysql -v], output
    end
  end
  test "logs" do
    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
      .with("ssh -t root@1.1.1.3 'docker logs app-mysql --timestamps --tail 10 2>&1'")
    assert_match "docker logs app-mysql  --tail 100 --timestamps 2>&1", run_command("logs", "mysql")
  end
  test "logs with follow" do
    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
      .with("ssh -t root@1.1.1.3 'docker logs app-mysql --timestamps --tail 10 --follow 2>&1'")
    assert_match "docker logs app-mysql --timestamps --tail 10 --follow 2>&1", run_command("logs", "mysql", "--follow")
  end
  test "remove with confirmation" do
    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
    run_command("remove", "mysql", "-y")
  end
  test "remove all with confirmation" do
    Kamal::Cli::Accessory.any_instance.expects(:stop).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("mysql")
    Kamal::Cli::Accessory.any_instance.expects(:stop).with("redis")
    Kamal::Cli::Accessory.any_instance.expects(:remove_container).with("redis")
    Kamal::Cli::Accessory.any_instance.expects(:remove_image).with("redis")
    Kamal::Cli::Accessory.any_instance.expects(:remove_service_directory).with("redis")
    run_command("remove", "all", "-y")
  end
  test "remove_container" do
    assert_match "docker container prune --force --filter label=service=app-mysql", run_command("remove_container", "mysql")
  end
  test "remove_image" do
    assert_match "docker image rm --force mysql", run_command("remove_image", "mysql")
  end
  test "remove_service_directory" do
    assert_match "rm -rf app-mysql", run_command("remove_service_directory", "mysql")
  end
  private
    def run_command(*command)
-      stdouted { Kamal::Cli::Accessory.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
+      stdouted { Mrsk::Cli::Accessory.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
    end
 end
--- a/test/cli/app_test.rb
+++ b/test/cli/app_test.rb
@@ -2,188 +2,66 @@ require_relative "cli_test_case"
 class CliAppTest < CliTestCase
  test "boot" do
-    stub_running
+    assert_match /Running docker run -d --restart unless-stopped/, run_command("boot")
    run_command("boot").tap do |output|
      assert_match "docker tag dhh/app:latest dhh/app:latest", output
      assert_match /docker run --detach --restart unless-stopped --name app-web-latest --hostname 1.1.1.1-[0-9a-f]{12} /, output
      assert_match "docker container ls --all --filter name=^app-web-123$ --quiet | xargs docker stop", output
    end
  end
-  test "boot will rename if same version is already running" do
+  test "boot will reboot if same version is already running" do
-    run_command("details") # Preheat Kamal const
+    run_command("details") # Preheat MRSK const
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
+    # Prevent expected failures from outputting to terminal
-      .with(:docker, :container, :ls, "--filter", "name=^app-web-latest$", "--quiet", raise_on_non_zero_exit: false)
+    Thread.report_on_exception = false
      .returns("12345678") # running version
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
+    MRSK.app.stubs(:run).raises(SSHKit::Command::Failed.new("already in use")).then.returns([ :docker, :run ])
      .with(:docker, :container, :ls, "--all", "--filter", "name=^app-web-latest$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
      .returns("running") # health check
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
      .returns("123") # old version
    run_command("boot").tap do |output|
-      assert_match /Renaming container .* to .* as already deployed on 1.1.1.1/, output # Rename
+      assert_match /Rebooting container with same version already deployed/, output # Can't start what's already running
-      assert_match /docker rename app-web-latest app-web-latest_replaced_[0-9a-f]{16}/, output
+      assert_match /docker ps -q --filter label=service=app \| xargs docker stop/, output # Stop what's running
-      assert_match /docker run --detach --restart unless-stopped --name app-web-latest --hostname 1.1.1.1-[0-9a-f]{12} /, output
+      assert_match /docker container ls -a -f name=app-999 -q \| xargs docker container rm/, output # Remove old container
-      assert_match "docker container ls --all --filter name=^app-web-123$ --quiet | xargs docker stop", output
+      assert_match /docker run/, output # Start new container
    end
  ensure
    Thread.report_on_exception = true
  end
  test "boot uses group strategy when specified" do
    Kamal::Cli::App.any_instance.stubs(:on).with("1.1.1.1").twice # acquire & release lock
    Kamal::Cli::App.any_instance.stubs(:on).with([ "1.1.1.1" ]) # tag container
    # Strategy is used when booting the containers
    Kamal::Cli::App.any_instance.expects(:on).with([ "1.1.1.1" ], in: :groups, limit: 3, wait: 2).with_block_given
    run_command("boot", config: :with_boot_strategy)
  end
  test "boot errors leave lock in place" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999" }
    Kamal::Cli::App.any_instance.expects(:using_version).raises(RuntimeError)
    assert !KAMAL.holding_lock?
    assert_raises(RuntimeError) do
      stderred { run_command("boot") }
    end
    assert KAMAL.holding_lock?
  end
  test "start" do
    run_command("start").tap do |output|
-      assert_match "docker start app-web-999", output
+      assert_match /docker start app-999/, output
    end
  end
  test "stop" do
    run_command("stop").tap do |output|
-      assert_match "docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest | xargs docker stop", output
+      assert_match /docker ps -q --filter label=service=app \| xargs docker stop/, output
    end
  end
  test "stale_containers" do
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
      .returns("12345678\n87654321")
    run_command("stale_containers").tap do |output|
      assert_match /Detected stale container for role web with version 87654321/, output
    end
  end
  test "stop stale_containers" do
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
      .returns("12345678\n87654321")
    run_command("stale_containers", "--stop").tap do |output|
      assert_match /Stopping stale container for role web with version 87654321/, output
      assert_match /#{Regexp.escape("docker container ls --all --filter name=^app-web-87654321$ --quiet | xargs docker stop")}/, output
    end
  end
  test "details" do
    run_command("details").tap do |output|
-      assert_match "docker ps --filter label=service=app --filter label=role=web", output
+      assert_match /docker ps --filter label=service=app/, output
    end
  end
  test "remove" do
    run_command("remove").tap do |output|
      assert_match /#{Regexp.escape("docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest | xargs docker stop")}/, output
      assert_match /#{Regexp.escape("docker container prune --force --filter label=service=app")}/, output
      assert_match /#{Regexp.escape("docker image prune --all --force --filter label=service=app")}/, output
    end
  end
  test "remove_container" do
    run_command("remove_container", "1234567").tap do |output|
-      assert_match "docker container ls --all --filter name=^app-web-1234567$ --quiet | xargs docker container rm", output
+      assert_match /docker container ls -a -f name=app-1234567 -q \| xargs docker container rm/, output
    end
  end
  test "remove_containers" do
    run_command("remove_containers").tap do |output|
      assert_match "docker container prune --force --filter label=service=app", output
    end
  end
  test "remove_images" do
    run_command("remove_images").tap do |output|
      assert_match "docker image prune --all --force --filter label=service=app", output
    end
  end
  test "exec" do
    run_command("exec", "ruby -v").tap do |output|
-      assert_match "docker run --rm dhh/app:latest ruby -v", output
+      assert_match /ruby -v/, output
    end
  end
  test "exec with reuse" do
    run_command("exec", "--reuse", "ruby -v").tap do |output|
-      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output # Get current version
+      assert_match %r[docker ps --filter label=service=app --format \"{{.Names}}\" | sed 's/-/\\n/g' | tail -n 1], output # Get current version
-      assert_match "docker exec app-web-999 ruby -v", output
+      assert_match %r[docker exec app-999 ruby -v], output
    end
  end
  test "containers" do
    run_command("containers").tap do |output|
      assert_match "docker container ls --all --filter label=service=app", output
    end
  end
  test "images" do
    run_command("images").tap do |output|
      assert_match "docker image ls dhh/app", output
    end
  end
  test "logs" do
    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
      .with("ssh -t root@1.1.1.1 'docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest| xargs docker logs --timestamps --tail 10 2>&1'")
    assert_match "docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest | xargs docker logs --tail 100 2>&1", run_command("logs")
  end
  test "logs with follow" do
    SSHKit::Backend::Abstract.any_instance.stubs(:exec)
      .with("ssh -t root@1.1.1.1 'docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest | xargs docker logs --timestamps --tail 10 --follow 2>&1'")
    assert_match "docker ps --quiet --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest | xargs docker logs --timestamps --tail 10 --follow 2>&1", run_command("logs", "--follow")
  end
  test "version" do
    run_command("version").tap do |output|
      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output
    end
  end
  test "version through main" do
    stdouted { Kamal::Cli::Main.start(["app", "version", "-c", "test/fixtures/deploy_with_accessories.yml", "--hosts", "1.1.1.1"]) }.tap do |output|
      assert_match "docker ps --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --latest --format \"{{.Names}}\" | while read line; do echo ${line#app-web-}; done", output
    end
  end
  private
-    def run_command(*command, config: :with_accessories)
+    def run_command(*command)
-      stdouted { Kamal::Cli::App.start([*command, "-c", "test/fixtures/deploy_#{config}.yml", "--hosts", "1.1.1.1"]) }
+      stdouted { Mrsk::Cli::App.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
    end
    def stub_running
      SSHKit::Backend::Abstract.any_instance.stubs(:capture_with_info).returns("123") # old version
      SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
        .with(:docker, :container, :ls, "--all", "--filter", "name=^app-web-latest$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
        .returns("running") # health check
    end
 end
--- a/test/cli/build_test.rb
+++ b/test/cli/build_test.rb
@@ -1,108 +0,0 @@
 require_relative "cli_test_case"
 class CliBuildTest < CliTestCase
  test "deliver" do
    Kamal::Cli::Build.any_instance.expects(:push)
    Kamal::Cli::Build.any_instance.expects(:pull)
    run_command("deliver")
  end
  test "push" do
    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
    hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2,1.1.1.3,1.1.1.4", command: "build", subcommand: "push" }
    run_command("push").tap do |output|
      assert_hook_ran "pre-build", output, **hook_variables
      assert_match /docker --version && docker buildx version/, output
      assert_match /docker buildx build --push --platform linux\/amd64,linux\/arm64 --builder kamal-app-multiarch -t dhh\/app:999 -t dhh\/app:latest --label service="app" --file Dockerfile \. as .*@localhost/, output
    end
  end
  test "push without builder" do
    stub_locking
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, "--version", "&&", :docker, :buildx, "version")
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with { |*args| args[0..1] == [:docker, :buildx] }
      .raises(SSHKit::Command::Failed.new("no builder"))
      .then
      .returns(true)
    run_command("push").tap do |output|
      assert_match /Missing compatible builder, so creating a new one first/, output
    end
  end
  test "push with no buildx plugin" do
    stub_locking
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, "--version", "&&", :docker, :buildx, "version")
      .raises(SSHKit::Command::Failed.new("no buildx"))
    Kamal::Commands::Builder.any_instance.stubs(:native_and_local?).returns(false)
    assert_raises(Kamal::Cli::Build::BuildError) { run_command("push") }
  end
  test "push pre-build hook failure" do
    fail_hook("pre-build")
    assert_raises(Kamal::Cli::HookError) { run_command("push") }
    assert @executions.none? { |args| args[0..2] == [:docker, :buildx, :build] }
  end
  test "pull" do
    run_command("pull").tap do |output|
      assert_match /docker image rm --force dhh\/app:999/, output
      assert_match /docker pull dhh\/app:999/, output
    end
  end
  test "create" do
    run_command("create").tap do |output|
      assert_match /docker buildx create --use --name kamal-app-multiarch/, output
    end
  end
  test "create with error" do
    stub_locking
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with { |arg| arg == :docker }
      .raises(SSHKit::Command::Failed.new("stderr=error"))
    run_command("create").tap do |output|
      assert_match /Couldn't create remote builder: error/, output
    end
  end
  test "remove" do
    run_command("remove").tap do |output|
      assert_match /docker buildx rm kamal-app-multiarch/, output
    end
  end
  test "details" do
    SSHKit::Backend::Abstract.any_instance.stubs(:capture)
      .with(:docker, :context, :ls, "&&", :docker, :buildx, :ls)
      .returns("docker builder info")
    run_command("details").tap do |output|
      assert_match /Builder: multiarch/, output
      assert_match /docker builder info/, output
    end
  end
  private
    def run_command(*command)
      stdouted { Kamal::Cli::Build.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
    end
    def stub_dependency_checks
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with(:docker, "--version", "&&", :docker, :buildx, "version")
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with { |*args| args[0..1] == [:docker, :buildx] }
    end
 end
--- a/test/cli/cli_test_case.rb
+++ b/test/cli/cli_test_case.rb
@@ -1,56 +1,24 @@
 require "test_helper"
 require "active_support/testing/stream"
 class CliTestCase < ActiveSupport::TestCase
  include ActiveSupport::Testing::Stream
  setup do
    ENV["VERSION"]             = "999"
    ENV["RAILS_MASTER_KEY"]    = "123"
    ENV["MYSQL_ROOT_PASSWORD"] = "secret123"
    Object.send(:remove_const, :KAMAL)
    Object.const_set(:KAMAL, Kamal::Commander.new)
  end
  teardown do
    ENV.delete("RAILS_MASTER_KEY")
    ENV.delete("MYSQL_ROOT_PASSWORD")
    ENV.delete("VERSION")
    MRSK.reset
  end
  private
-    def fail_hook(hook)
+    def stdouted
-      @executions = []
+      capture(:stdout) { yield }.strip
      Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with { |*args| @executions << args; args != [".kamal/hooks/#{hook}"] }
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with { |*args| args.first == ".kamal/hooks/#{hook}" }
        .raises(SSHKit::Command::Failed.new("failed"))
    end
    def stub_locking
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with { |arg1, arg2| arg1 == :mkdir && arg2 == "kamal_lock-app" }
      SSHKit::Backend::Abstract.any_instance.stubs(:execute)
        .with { |arg1, arg2| arg1 == :rm && arg2 == "kamal_lock-app/details" }
    end
    def assert_hook_ran(hook, output, version:, service_version:, hosts:, command:, subcommand: nil, runtime: nil)
      performer = `whoami`.strip
      assert_match "Running the #{hook} hook...\n", output
      expected = %r{Running\s/usr/bin/env\s\.kamal/hooks/#{hook}\sas\s#{performer}@localhost\n\s
        DEBUG\s\[[0-9a-f]*\]\sCommand:\s\(\sexport\s
        KAMAL_RECORDED_AT=\"\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ\"\s
        KAMAL_PERFORMER=\"#{performer}\"\s
        KAMAL_VERSION=\"#{version}\"\s
        KAMAL_SERVICE_VERSION=\"#{service_version}\"\s
        KAMAL_HOSTS=\"#{hosts}\"\s
        KAMAL_COMMAND=\"#{command}\"\s
        #{"KAMAL_SUBCOMMAND=\\\"#{subcommand}\\\"\\s" if subcommand}
        #{"KAMAL_RUNTIME=\\\"#{runtime}\\\"\\s" if runtime}
        ;\s/usr/bin/env\s\.kamal/hooks/#{hook} }x
      assert_match expected, output
    end
 end
--- a/test/cli/healthcheck_test.rb
+++ b/test/cli/healthcheck_test.rb
@@ -1,71 +0,0 @@
 require_relative "cli_test_case"
 class CliHealthcheckTest < CliTestCase
  test "perform" do
    # Prevent expected failures from outputting to terminal
    Thread.report_on_exception = false
    Kamal::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :stop, raise_on_non_zero_exit: false)
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "KAMAL_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :container, :rm, raise_on_non_zero_exit: false)
    # Fail twice to test retry logic
    SSHKit::Backend::Abstract.any_instance.stubs(:capture_with_info)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
      .returns("starting")
      .then
      .returns("unhealthy")
      .then
      .returns("healthy")
    run_command("perform").tap do |output|
      assert_match "container not ready (starting), retrying in 1s (attempt 1/7)...", output
      assert_match "container not ready (unhealthy), retrying in 2s (attempt 2/7)...", output
      assert_match "Container is healthy!", output
    end
  end
  test "perform failing to become healthy" do
    # Prevent expected failures from outputting to terminal
    Thread.report_on_exception = false
    Kamal::Utils::HealthcheckPoller.stubs(:sleep) # No sleeping when retrying
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :stop, raise_on_non_zero_exit: false)
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :run, "--detach", "--name", "healthcheck-app-999", "--publish", "3999:3000", "--label", "service=healthcheck-app", "-e", "KAMAL_CONTAINER_NAME=\"healthcheck-app\"", "--health-cmd", "\"curl -f http://localhost:3000/up || exit 1\"", "--health-interval", "\"1s\"", "dhh/app:999")
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :container, :rm, raise_on_non_zero_exit: false)
    # Continually report unhealthy
    SSHKit::Backend::Abstract.any_instance.stubs(:capture_with_info)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
      .returns("unhealthy")
    # Capture logs when failing
    SSHKit::Backend::Abstract.any_instance.stubs(:capture_with_info)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :logs, "--tail", 50, "2>&1")
      .returns("some log output")
    # Capture container health log when failing
    SSHKit::Backend::Abstract.any_instance.stubs(:capture_with_pretty_json)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^healthcheck-app-999$", "--quiet", "|", :xargs, :docker, :inspect, "--format",  "'{{json .State.Health}}'")
      .returns('{"Status":"unhealthy","Log":[{"ExitCode": 1,"Output": "/bin/sh: 1: curl: not found\n"}]}"')
    exception = assert_raises do
      run_command("perform")
    end
    assert_match "container not ready (unhealthy)", exception.message
  end
  private
    def run_command(*command)
      stdouted { Kamal::Cli::Healthcheck.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
    end
 end
--- a/test/cli/lock_test.rb
+++ b/test/cli/lock_test.rb
@@ -1,20 +0,0 @@
 require_relative "cli_test_case"
 class CliLockTest < CliTestCase
  test "status" do
    run_command("status") do |output|
      assert_match "stat lock", output
    end
  end
  test "release" do
    run_command("release") do |output|
      assert_match "rm -rf lock", output
    end
  end
  private
    def run_command(*command)
      stdouted { Kamal::Cli::Lock.start([*command, "-c", "test/fixtures/deploy_with_accessories.yml"]) }
    end
 end
--- a/test/cli/main_test.rb
+++ b/test/cli/main_test.rb
@@ -1,375 +1,8 @@
 require_relative "cli_test_case"
 class CliMainTest < CliTestCase
  test "setup" do
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:server:bootstrap")
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:boot", [ "all" ])
    Kamal::Cli::Main.any_instance.expects(:deploy)
    run_command("setup")
  end
  test "deploy" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
    hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2", command: "deploy" }
    run_command("deploy").tap do |output|
      assert_hook_ran "pre-connect", output, **hook_variables
      assert_match /Log into image registry/, output
      assert_match /Build and push app image/, output
      assert_hook_ran "pre-deploy", output, **hook_variables
      assert_match /Ensure Traefik is running/, output
      assert_match /Ensure app can pass healthcheck/, output
      assert_match /Detect stale containers/, output
      assert_match /Prune old containers and images/, output
      assert_hook_ran "post-deploy", output, **hook_variables, runtime: 0
    end
  end
  test "deploy with skip_push" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:pull", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
    run_command("deploy", "--skip_push").tap do |output|
      assert_match /Acquiring the deploy lock/, output
      assert_match /Log into image registry/, output
      assert_match /Pull app image/, output
      assert_match /Ensure Traefik is running/, output
      assert_match /Ensure app can pass healthcheck/, output
      assert_match /Detect stale containers/, output
      assert_match /Prune old containers and images/, output
      assert_match /Releasing the deploy lock/, output
    end
  end
  test "deploy when locked" do
    Thread.report_on_exception = false
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with { |*arg| arg[0..1] == [:mkdir, 'kamal_lock-app'] }
      .raises(RuntimeError, "mkdir: cannot create directory ‘kamal_lock-app’: File exists")
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_debug)
      .with(:stat, 'kamal_lock-app', ">", "/dev/null", "&&", :cat, "kamal_lock-app/details", "|", :base64, "-d")
    assert_raises(Kamal::Cli::LockError) do
      run_command("deploy")
    end
  end
  test "deploy error when locking" do
    Thread.report_on_exception = false
    SSHKit::Backend::Abstract.any_instance.stubs(:execute)
      .with { |*arg| arg[0..1] == [:mkdir, 'kamal_lock-app'] }
      .raises(SocketError, "getaddrinfo: nodename nor servname provided, or not known")
    assert_raises(SSHKit::Runner::ExecuteError) do
      run_command("deploy")
    end
  end
  test "deploy errors during outside section leave remove lock" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
    Kamal::Cli::Main.any_instance.expects(:invoke)
      .with("kamal:cli:registry:login", [], invoke_options)
      .raises(RuntimeError)
    assert !KAMAL.holding_lock?
    assert_raises(RuntimeError) do
      stderred { run_command("deploy") }
    end
    assert !KAMAL.holding_lock?
  end
  test "deploy with skipped hooks" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => true }
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:registry:login", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:prune:all", [], invoke_options)
    run_command("deploy", "--skip_hooks") do
      refute_match /Running the post-deploy hook.../, output
    end
  end
  test "deploy with missing secrets" do
    assert_raises(KeyError) do
      run_command("deploy", config_file: "deploy_with_secrets")
    end
  end
  test "redeploy" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:deliver", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
    hook_variables = { version: 999, service_version: "app@999", hosts: "1.1.1.1,1.1.1.2", command: "redeploy" }
    run_command("redeploy").tap do |output|
      assert_hook_ran "pre-connect", output, **hook_variables
      assert_match /Build and push app image/, output
      assert_hook_ran "pre-deploy", output, **hook_variables
      assert_match /Running the pre-deploy hook.../, output
      assert_match /Ensure app can pass healthcheck/, output
      assert_hook_ran "post-deploy", output, **hook_variables, runtime: "0"
    end
  end
  test "redeploy with skip_push" do
    invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:build:pull", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:healthcheck:perform", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:stale_containers", [], invoke_options)
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:boot", [], invoke_options)
    run_command("redeploy", "--skip_push").tap do |output|
      assert_match /Pull app image/, output
      assert_match /Ensure app can pass healthcheck/, output
    end
  end
  test "rollback bad version" do
    Thread.report_on_exception = false
    run_command("details") # Preheat Kamal const
    run_command("rollback", "nonsense").tap do |output|
      assert_match /docker container ls --all --filter name=\^app-web-nonsense\$ --quiet/, output
      assert_match /The app version 'nonsense' is not available as a container/, output
    end
  end
  test "rollback good version" do
    [ "web", "workers" ].each do |role|
      SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
        .with(:docker, :container, :ls, "--filter", "name=^app-#{role}-123$", "--quiet", raise_on_non_zero_exit: false)
        .returns("").at_least_once
      SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
        .with(:docker, :container, :ls, "--all", "--filter", "name=^app-#{role}-123$", "--quiet")
        .returns("version-to-rollback\n").at_least_once
      SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
        .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=#{role}", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-#{role}-}; done", raise_on_non_zero_exit: false)
        .returns("version-to-rollback\n").at_least_once
      SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
        .with(:docker, :container, :ls, "--all", "--filter", "name=^app-#{role}-123$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
        .returns("running").at_least_once # health check
    end
    Kamal::Commands::Hook.any_instance.stubs(:hook_exists?).returns(true)
    hook_variables = { version: 123, service_version: "app@123", hosts: "1.1.1.1,1.1.1.2,1.1.1.3,1.1.1.4", command: "rollback" }
    run_command("rollback", "123", config_file: "deploy_with_accessories").tap do |output|
      assert_match "Start container with version 123", output
      assert_hook_ran "pre-deploy", output, **hook_variables
      assert_match "docker tag dhh/app:123 dhh/app:latest", output
      assert_match "docker start app-web-123", output
      assert_match "docker container ls --all --filter name=^app-web-version-to-rollback$ --quiet | xargs docker stop", output, "Should stop the container that was previously running"
      assert_hook_ran "post-deploy", output, **hook_variables, runtime: "0"
    end
  end
  test "rollback without old version" do
    Kamal::Cli::Main.any_instance.stubs(:container_available?).returns(true)
    Kamal::Utils::HealthcheckPoller.stubs(:sleep)
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :container, :ls, "--filter", "name=^app-web-123$", "--quiet", raise_on_non_zero_exit: false)
      .returns("").at_least_once
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :ps, "--filter", "label=service=app", "--filter", "label=role=web", "--filter", "status=running", "--filter", "status=restarting", "--latest", "--format", "\"{{.Names}}\"", "|", "while read line; do echo ${line#app-web-}; done", raise_on_non_zero_exit: false)
      .returns("").at_least_once
    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
      .with(:docker, :container, :ls, "--all", "--filter", "name=^app-web-123$", "--quiet", "|", :xargs, :docker, :inspect, "--format", "'{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}'")
      .returns("running").at_least_once # health check
    run_command("rollback", "123").tap do |output|
      assert_match "Start container with version 123", output
      assert_match "docker start app-web-123 || docker run --detach --restart unless-stopped --name app-web-123", output
      assert_no_match "docker stop", output
    end
  end
  test "details" do
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:details")
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:details")
    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:details", [ "all" ])
    run_command("details")
  end
  test "audit" do
    run_command("audit").tap do |output|
      assert_match /tail -n 50 kamal-app-audit.log on 1.1.1.1/, output
      assert_match /App Host: 1.1.1.1/, output
    end
  end
  test "config" do
    run_command("config", config_file: "deploy_simple").tap do |output|
      config = YAML.load(output)
      assert_equal ["web"], config[:roles]
      assert_equal ["1.1.1.1", "1.1.1.2"], config[:hosts]
      assert_equal "999", config[:version]
      assert_equal "dhh/app", config[:repository]
      assert_equal "dhh/app:999", config[:absolute_image]
      assert_equal "app-999", config[:service_with_version]
    end
  end
  test "config with roles" do
    run_command("config", config_file: "deploy_with_roles").tap do |output|
      config = YAML.load(output)
      assert_equal ["web", "workers"], config[:roles]
      assert_equal ["1.1.1.1", "1.1.1.2", "1.1.1.3", "1.1.1.4"], config[:hosts]
      assert_equal "999", config[:version]
      assert_equal "registry.digitalocean.com/dhh/app", config[:repository]
      assert_equal "registry.digitalocean.com/dhh/app:999", config[:absolute_image]
      assert_equal "app-999", config[:service_with_version]
    end
  end
  test "config with destination" do
    run_command("config", "-d", "world", config_file: "deploy_for_dest").tap do |output|
      config = YAML.load(output)
      assert_equal ["web"], config[:roles]
      assert_equal ["1.1.1.1", "1.1.1.2"], config[:hosts]
      assert_equal "999", config[:version]
      assert_equal "registry.digitalocean.com/dhh/app", config[:repository]
      assert_equal "registry.digitalocean.com/dhh/app:999", config[:absolute_image]
      assert_equal "app-999", config[:service_with_version]
    end
  end
  test "init" do
    Pathname.any_instance.expects(:exist?).returns(false).times(3)
    Pathname.any_instance.stubs(:mkpath)
    FileUtils.stubs(:mkdir_p)
    FileUtils.stubs(:cp_r)
    FileUtils.stubs(:cp)
    run_command("init").tap do |output|
      assert_match /Created configuration file in config\/deploy.yml/, output
      assert_match /Created \.env file/, output
    end
  end
  test "init with existing config" do
    Pathname.any_instance.expects(:exist?).returns(true).times(3)
    run_command("init").tap do |output|
      assert_match /Config file already exists in config\/deploy.yml \(remove first to create a new one\)/, output
    end
  end
  test "init with bundle option" do
    Pathname.any_instance.expects(:exist?).returns(false).times(4)
    Pathname.any_instance.stubs(:mkpath)
    FileUtils.stubs(:mkdir_p)
    FileUtils.stubs(:cp_r)
    FileUtils.stubs(:cp)
    run_command("init", "--bundle").tap do |output|
      assert_match /Created configuration file in config\/deploy.yml/, output
      assert_match /Created \.env file/, output
      assert_match /Adding Kamal to Gemfile and bundle/, output
      assert_match /bundle add kamal/, output
      assert_match /bundle binstubs kamal/, output
      assert_match /Created binstub file in bin\/kamal/, output
    end
  end
  test "init with bundle option and existing binstub" do
    Pathname.any_instance.expects(:exist?).returns(true).times(4)
    Pathname.any_instance.stubs(:mkpath)
    FileUtils.stubs(:mkdir_p)
    FileUtils.stubs(:cp_r)
    FileUtils.stubs(:cp)
    run_command("init", "--bundle").tap do |output|
      assert_match /Config file already exists in config\/deploy.yml \(remove first to create a new one\)/, output
      assert_match /Binstub already exists in bin\/kamal \(remove first to create a new one\)/, output
    end
  end
  test "envify" do
    File.expects(:read).with(".env.erb").returns("HELLO=<%= 'world' %>")
    File.expects(:write).with(".env", "HELLO=world", perm: 0600)
    run_command("envify")
  end
  test "envify with destination" do
    File.expects(:read).with(".env.staging.erb").returns("HELLO=<%= 'world' %>")
    File.expects(:write).with(".env.staging", "HELLO=world", perm: 0600)
    run_command("envify", "-d", "staging")
  end
  test "remove with confirmation" do
    run_command("remove", "-y", config_file: "deploy_with_accessories").tap do |output|
      assert_match /docker container stop traefik/, output
      assert_match /docker container prune --force --filter label=org.opencontainers.image.title=Traefik/, output
      assert_match /docker image prune --all --force --filter label=org.opencontainers.image.title=Traefik/, output
      assert_match /docker ps --quiet --filter label=service=app | xargs docker stop/, output
      assert_match /docker container prune --force --filter label=service=app/, output
      assert_match /docker image prune --all --force --filter label=service=app/, output
      assert_match /docker container stop app-mysql/, output
      assert_match /docker container prune --force --filter label=service=app-mysql/, output
      assert_match /docker image rm --force mysql/, output
      assert_match /rm -rf app-mysql/, output
      assert_match /docker container stop app-redis/, output
      assert_match /docker container prune --force --filter label=service=app-redis/, output
      assert_match /docker image rm --force redis/, output
      assert_match /rm -rf app-redis/, output
      assert_match /docker logout/, output
    end
  end
  test "version" do
-    version = stdouted { Kamal::Cli::Main.new.version }
+    version = stdouted { Mrsk::Cli::Main.new.version }
-    assert_equal Kamal::VERSION, version
+    assert_equal Mrsk::VERSION, version
  end
  private
    def run_command(*command, config_file: "deploy_simple")
      stdouted { Kamal::Cli::Main.start([*command, "-c", "test/fixtures/#{config_file}.yml"]) }
    end
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Heinemeier Hansson	2e02b1ed14	Bump version for 0.6.1	2023-02-07 15:05:52 +01:00
David Heinemeier Hansson	fdd98622ac	Fix issue with removing containers triggering twice, then ensure app stop runs closer to app run on each host	2023-02-07 15:05:06 +01:00
		`@@ -1,2 +0,0 @@`
			`KAMAL_REGISTRY_PASSWORD=change-this`
			`RAILS_MASTER_KEY=another-env`
		`@@ -0,0 +1,2 @@`
							`MRSK_REGISTRY_PASSWORD=change-this`
							`RAILS_MASTER_KEY=another-env`