From 57e9231c5ee9e6acab58e317ed78e877117e5164 Mon Sep 17 00:00:00 2001
From: Dave Gudge <dave@gudge.uk>
Date: Fri, 10 Mar 2023 10:02:33 +0000
Subject: [PATCH 1/9] fix: Github Workflow: Docker Publish

The workflow was failing with:

```
The workflow is not valid. .github/workflows/docker-publish.yml (Line: 22, Col: 14): Unexpected symbol: '|'. Located at position 12 within expression: github.ref | replace('refs/tags/', '')
```

The `set-output` command is deprecated, so the issue has been fixed by utilising the `github.ref_name` context to retrieve the version tag that triggered the workflow.

> `github.ref_name`: The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, `feature-branch-1`.

https://docs.github.com/en/actions/learn-github-actions/contexts
---
 .github/workflows/docker-publish.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index da7e99a5..134ecac0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -16,10 +16,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Extract Version Number
-        id: extract_version
-        run: echo "::set-output name=version::${{ github.ref | replace('refs/tags/', '') }}"
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -42,4 +38,4 @@ jobs:
           push: true
           tags: |
             ghcr.io/mrsked/mrsk:latest
-            ghcr.io/mrsked/mrsk:${{ steps.extract_version.outputs.version }}
+            ghcr.io/mrsked/mrsk:${{ github.ref_name }}

From e5c5e892326a404216d07f203fb5f6dc8b6f770b Mon Sep 17 00:00:00 2001
From: Richard Taylor <moomerman@gmail.com>
Date: Fri, 10 Mar 2023 15:55:04 +0000
Subject: [PATCH 2/9] Use custom web options for healthcheck

If the web role has custom options, ensure these are used for the
healthcheck.
---
 lib/mrsk/commands/healthcheck.rb  | 1 +
 test/commands/healthcheck_test.rb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/lib/mrsk/commands/healthcheck.rb b/lib/mrsk/commands/healthcheck.rb
index 40ec2af7..722d2a05 100644
--- a/lib/mrsk/commands/healthcheck.rb
+++ b/lib/mrsk/commands/healthcheck.rb
@@ -11,6 +11,7 @@ class Mrsk::Commands::Healthcheck < Mrsk::Commands::Base
       "--label", "service=#{container_name}",
       *web.env_args,
       *config.volume_args,
+      *web.option_args,
       config.absolute_image,
       web.cmd
   end
diff --git a/test/commands/healthcheck_test.rb b/test/commands/healthcheck_test.rb
index 05fbc8c3..acf88fbd 100644
--- a/test/commands/healthcheck_test.rb
+++ b/test/commands/healthcheck_test.rb
@@ -30,6 +30,13 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
       new_command.run.join(" ")
   end
 
+  test "run with custom options" do
+    @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "options" => { "mount" => "somewhere" } } }
+    assert_equal \
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app --mount \"somewhere\" dhh/app:123",
+      new_command.run.join(" ")
+  end
+
   test "curl" do
     assert_equal \
       "curl --silent --output /dev/null --write-out '%{http_code}' --max-time 2 http://localhost:3999/up",

From 439b6813088ef968f2b6e38885afb912f05f9cc4 Mon Sep 17 00:00:00 2001
From: Jordy Schreuders <3071062+99linesofcode@users.noreply.github.com>
Date: Fri, 10 Mar 2023 18:13:32 +0200
Subject: [PATCH 3/9] Neglected to install buildx inside container

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 98dd3c69..b43c60e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,9 @@
 # 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 /mrsk
 WORKDIR /mrsk
 

From b2c819fe324f060fdad20ede41c1c7139c79d34f Mon Sep 17 00:00:00 2001
From: Jordy Schreuders <3071062+99linesofcode@users.noreply.github.com>
Date: Fri, 10 Mar 2023 19:23:14 +0200
Subject: [PATCH 4/9] Add README section on running MRSK from Docker

---
 README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 168bed4c..668a11e0 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ env:
     - RAILS_MASTER_KEY
 ```
 
-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). 
+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:
 
@@ -67,6 +67,16 @@ Docker Swarm is much simpler than Kubernetes, but it's still built on the same d
 
 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 MRSK from Docker
+
+MRSK is packaged up in a Docker container similarly to [rails/docked](https://github.com/rails/docked). This will allow you to run MRSK (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 mrsk="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/mrsked/mrsk:latest"
+```
+
+Since MRSK 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
@@ -99,9 +109,9 @@ If you need separate env variables for different destinations, you can set them
 
 #### 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. 
+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. 
+You can store `SOME_SECRET` in a secure note in bitwarden vault.
 
 ```
 $ bw list items --search SOME_SECRET | jq
@@ -140,7 +150,7 @@ SOME_SECRET=<%= `bw get notes 123123123-1232-4224-222f-234234234234 --session #{
 <% else raise ArgumentError, "session_token token missing" end %>
 ```
 
-Then everyone deploying the app can run `mrsk envify` and mrsk will generate `.env` 
+Then everyone deploying the app can run `mrsk envify` and mrsk will generate `.env`
 
 
 ### Using another registry than Docker Hub
@@ -150,9 +160,9 @@ The default registry is Docker Hub, but you can change it using `registry/server
 ```yaml
 registry:
   server: registry.digitalocean.com
-  username:  
+  username:
     - DOCKER_REGISTRY_TOKEN
-  password: 
+  password:
     - DOCKER_REGISTRY_TOKEN
 ```
 

From 643cb2c520ffd27301afed3260497b281ad541d4 Mon Sep 17 00:00:00 2001
From: Chris Lowder <clowder@gmail.com>
Date: Fri, 10 Mar 2023 19:27:01 +0000
Subject: [PATCH 5/9] Include edge Rails in the build matrix

Highlighting an incompatibility with the new implementation of
`[ActiveSupport::OrderedOptions#dig]`.

[^1]: https://github.com/rails/rails/commit/5c15b586aab85fc4fa1465499fc9a97a446f4d52
---
 .github/workflows/ci.yml    | 7 +++++--
 .gitignore                  | 3 ++-
 Gemfile                     | 4 ----
 gemfiles/rails_edge.gemfile | 9 +++++++++
 mrsk.gemspec                | 4 ++++
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 gemfiles/rails_edge.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fe7363e..1d9d2008 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,12 +8,15 @@ 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
 
diff --git a/.gitignore b/.gitignore
index 1e13116a..6100dc73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .byebug_history
 *.gem
 coverage/*
-.DS_Store
\ No newline at end of file
+.DS_Store
+gemfiles/*.lock
diff --git a/Gemfile b/Gemfile
index 9c31a8f8..f015da37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
-
-gem "debug"
-gem "mocha"
-gem "railties"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
new file mode 100644
index 00000000..34a16801
--- /dev/null
+++ b/gemfiles/rails_edge.gemfile
@@ -0,0 +1,9 @@
+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: "../"
diff --git a/mrsk.gemspec b/mrsk.gemspec
index 6cd77252..d359aa28 100644
--- a/mrsk.gemspec
+++ b/mrsk.gemspec
@@ -19,4 +19,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk", "~> 2.5"
   spec.add_dependency "ed25519", "~> 1.2"
   spec.add_dependency "bcrypt_pbkdf", "~> 1.0"
+
+  spec.add_development_dependency "debug"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "railties"
 end

From 41a5cb2a04adb7f55d227a9c556bba053faac937 Mon Sep 17 00:00:00 2001
From: Chris Lowder <clowder@gmail.com>
Date: Fri, 10 Mar 2023 19:27:53 +0000
Subject: [PATCH 6/9] Avoid `[ActiveSupport::OrderedOptions#dig]`

The implementation has been updated upstream[^1] to expect symbolized
keys. MRSK relies heavily on the fact that nested keys are strings, so
we're removing existing uses of `#dig`.

[^1]: https://github.com/rails/rails/commit/5c15b586aab85fc4fa1465499fc9a97a446f4d52
---
 lib/mrsk/commands/traefik.rb | 4 ++--
 lib/mrsk/configuration.rb    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb
index ee22e64b..67ab448a 100644
--- a/lib/mrsk/commands/traefik.rb
+++ b/lib/mrsk/commands/traefik.rb
@@ -55,7 +55,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
 
   private
     def cmd_option_args
-      if args = config.raw_config.dig(:traefik, "args")
+      if args = config.traefik["args"]
         optionize args
       else
         []
@@ -63,6 +63,6 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
     end
 
     def host_port
-      config.raw_config.dig(:traefik, "host_port") || CONTAINER_PORT
+      config.traefik["host_port"] || CONTAINER_PORT
     end
 end
diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb
index 64c116a2..03413116 100644
--- a/lib/mrsk/configuration.rb
+++ b/lib/mrsk/configuration.rb
@@ -165,6 +165,9 @@ class Mrsk::Configuration
     }.compact
   end
 
+  def traefik
+    raw_config.traefik || {}
+  end
 
   private
     # Will raise ArgumentError if any required config keys are missing

From f26beeaa9f6100098f62d94e9438c8d04d05c844 Mon Sep 17 00:00:00 2001
From: Chris Lowder <clowder@users.noreply.github.com>
Date: Fri, 10 Mar 2023 20:51:14 +0000
Subject: [PATCH 7/9] Update `accessory remove` description and warning

Make it clear the accessory's data directory will also be removed.
---
 lib/mrsk/cli/accessory.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mrsk/cli/accessory.rb b/lib/mrsk/cli/accessory.rb
index d0037cd4..834c7dec 100644
--- a/lib/mrsk/cli/accessory.rb
+++ b/lib/mrsk/cli/accessory.rb
@@ -149,13 +149,13 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
     end
   end
 
-  desc "remove [NAME]", "Remove accessory container and image from host (use NAME=all to remove all accessories)"
+  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)
     if name == "all"
       MRSK.accessory_names.each { |accessory_name| remove(accessory_name) }
     else
-      if options[:confirmed] || ask("This will remove all containers and images for #{name}. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
+      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)

From bb241dea4387b94b93fbc3a1382fd60b2f3682e6 Mon Sep 17 00:00:00 2001
From: Richard Taylor <moomerman@gmail.com>
Date: Fri, 10 Mar 2023 16:17:16 +0000
Subject: [PATCH 8/9] Add container name env var for containers

Because the container name is generated it isn't possible to
determine this inside the container.

This adds the MRSK_CONTAINER_NAME env var when running the
container so it can be read by the service running inside the
container.
---
 README.md                         | 6 ++++++
 lib/mrsk/commands/app.rb          | 1 +
 lib/mrsk/commands/healthcheck.rb  | 1 +
 test/commands/app_test.rb         | 8 ++++----
 test/commands/healthcheck_test.rb | 6 +++---
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 168bed4c..f4b5a4ac 100644
--- a/README.md
+++ b/README.md
@@ -222,6 +222,12 @@ volumes:
   - "/local/path:/container/path"
 ```
 
+### MRSK env variables
+
+The following env variables are set when your container runs:
+
+`MRSK_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:
diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb
index 906a30d2..37d70476 100644
--- a/lib/mrsk/commands/app.rb
+++ b/lib/mrsk/commands/app.rb
@@ -7,6 +7,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       "--restart unless-stopped",
       "--log-opt", "max-size=#{MAX_LOG_SIZE}",
       "--name", service_with_version_and_destination,
+      "-e", "MRSK_CONTAINER_NAME=\"#{service_with_version_and_destination}\"",
       *role.env_args,
       *config.volume_args,
       *role.label_args,
diff --git a/lib/mrsk/commands/healthcheck.rb b/lib/mrsk/commands/healthcheck.rb
index 40ec2af7..d4fba27a 100644
--- a/lib/mrsk/commands/healthcheck.rb
+++ b/lib/mrsk/commands/healthcheck.rb
@@ -9,6 +9,7 @@ class Mrsk::Commands::Healthcheck < Mrsk::Commands::Base
       "--name", container_name_with_version,
       "--publish", "#{EXPOSED_PORT}:#{config.healthcheck["port"]}",
       "--label", "service=#{container_name}",
+      "-e", "MRSK_CONTAINER_NAME=\"#{container_name}\"",
       *web.env_args,
       *config.volume_args,
       config.absolute_image,
diff --git a/test/commands/app_test.rb b/test/commands/app_test.rb
index da436bcb..806db53b 100644
--- a/test/commands/app_test.rb
+++ b/test/commands/app_test.rb
@@ -14,7 +14,7 @@ class CommandsAppTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/up\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e MRSK_CONTAINER_NAME=\"app-999\" -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/up\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
       @app.run.join(" ")
   end
 
@@ -22,7 +22,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:volumes] = ["/local/path:/container/path" ]
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=\"456\" --volume /local/path:/container/path --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/up\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e MRSK_CONTAINER_NAME=\"app-999\" -e RAILS_MASTER_KEY=\"456\" --volume /local/path:/container/path --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/up\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
       @app.run.join(" ")
   end
 
@@ -30,7 +30,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "path" => "/healthz" }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/healthz\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
+      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e MRSK_CONTAINER_NAME=\"app-999\" -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"web\" --label traefik.http.routers.app.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.services.app.loadbalancer.healthcheck.path=\"/healthz\" --label traefik.http.services.app.loadbalancer.healthcheck.interval=\"1s\" --label traefik.http.middlewares.app.retry.attempts=\"5\" --label traefik.http.middlewares.app.retry.initialinterval=\"500ms\" dhh/app:999",
       @app.run.join(" ")
   end
 
@@ -39,7 +39,7 @@ class CommandsAppTest < ActiveSupport::TestCase
     @app = Mrsk::Commands::App.new Mrsk::Configuration.new(@config).tap { |c| c.version = "999" }
 
     assert_equal \
-      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"jobs\" --mount \"somewhere\" --cap-add dhh/app:999 bin/jobs",
+      "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-999 -e MRSK_CONTAINER_NAME=\"app-999\" -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"jobs\" --mount \"somewhere\" --cap-add dhh/app:999 bin/jobs",
       @app.run(role: :jobs).join(" ")
   end
 
diff --git a/test/commands/healthcheck_test.rb b/test/commands/healthcheck_test.rb
index 05fbc8c3..54cb4362 100644
--- a/test/commands/healthcheck_test.rb
+++ b/test/commands/healthcheck_test.rb
@@ -10,7 +10,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
 
   test "run" do
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -18,7 +18,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
     @config[:healthcheck] = { "port" => 3001 }
 
     assert_equal \
-      "docker run --detach --name healthcheck-app-123 --publish 3999:3001 --label service=healthcheck-app dhh/app:123",
+      "docker run --detach --name healthcheck-app-123 --publish 3999:3001 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" dhh/app:123",
       new_command.run.join(" ")
   end
 
@@ -26,7 +26,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase
     @destination = "staging"
 
     assert_equal \
-      "docker run --detach --name healthcheck-app-staging-123 --publish 3999:3000 --label service=healthcheck-app-staging dhh/app:123",
+      "docker run --detach --name healthcheck-app-staging-123 --publish 3999:3000 --label service=healthcheck-app-staging -e MRSK_CONTAINER_NAME=\"healthcheck-app-staging\" dhh/app:123",
       new_command.run.join(" ")
   end
 

From 600902ef5e9d4869806d66b4e2bf6d02f211fac7 Mon Sep 17 00:00:00 2001
From: Rasmus Kjellberg <2277443+kjellberg@users.noreply.github.com>
Date: Sun, 12 Mar 2023 07:39:07 +0100
Subject: [PATCH 9/9] Update README.md

Backticks are handled by `Utils.optionize`
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 168bed4c..2427b0e8 100644
--- a/README.md
+++ b/README.md
@@ -256,12 +256,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.rule: Host(\`app.hey.com\`)
+  traefik.http.routers.hey.rule: Host(`app.hey.com`)
 ```
 
-Note: The escaped backticks are needed to ensure the rule is passed in correctly and not treated as command substitution by Bash!
+Note: The backticks are needed to ensure the rule is passed in correctly and not treated as command substitution by Bash!
 
 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.