Bump version for 0.8.2

.github/workflows/docker-publish.yml

@@ -1,45 +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: 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
-      -
-        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:${{ steps.extract_version.outputs.version }}

CODE_OF_CONDUCT.md

@@ -1,41 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of the MRSK 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 MRSK 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>.

CONTRIBUTING.md

@@ -1,49 +0,0 @@
-# Contributing to MRSK development
-
-Thank you for considering contributing to MRSK! 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 MRSK.
-
-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 [MRSK GitHub Issues tracker](https://github.com/mrsked/mrsk/issues).
-- **Submit patches** - Do you have a new feature or a fix you'd like to share? [Submit a pull request](https://github.com/mrsked/mrsk/pulls)!
-- **Write blog articles** - Are you using MRSK? 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/mrsked/mrsk/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 guidline
-
-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 MRSK.
-
-MRSK is written in Ruby. You should have Ruby 3.2+ installed on your machine in order to work on MRSK. 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/mrsked/mrsk/pulls) to the main project repository with a detailed description of your changes.
-
-## License
-
-MRSK is released under the MIT License. By contributing to this project, you agree to license your contributions under the same license.

Dockerfile

@@ -1,33 +0,0 @@
-# Use the official Ruby 3.2.0 Alpine image as the base image
-FROM ruby:3.2.0-alpine
-
-# Set the working directory to /mrsk
-WORKDIR /mrsk
-
-# Copy the Gemfile, Gemfile.lock into the container
-COPY Gemfile Gemfile.lock mrsk.gemspec ./
-
-# Required in mrsk.gemspec
-COPY lib/mrsk/version.rb /mrsk/lib/mrsk/version.rb
-
-# Install system dependencies
-RUN apk add --no-cache --update build-base git docker openrc \
-    && 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
-# everytime we do small fixes in the source code.
-COPY . .
-
-# Install the gem locally from the project folder
-RUN gem build mrsk.gemspec && \
-    gem install ./mrsk-*.gem --no-document
-
-# Set the working directory to /workdir
-WORKDIR /workdir
-
-# Set the entrypoint to run the installed binary in /workdir
-# Example:  docker run -it -v "$PWD:/workdir" mrsk init
-ENTRYPOINT ["mrsk"]

Gemfile

@@ -6,3 +6,5 @@ gemspec
 gem "debug"
 gem "mocha"
 gem "railties"
+gem "ed25519"
+gem "bcrypt_pbkdf"

Gemfile.lock

@@ -1,11 +1,9 @@
 PATH
   remote: .
   specs:
-    mrsk (0.9.0)
+    mrsk (0.8.2)
       activesupport (>= 7.0)
-      bcrypt_pbkdf (~> 1.0)
       dotenv (~> 2.8)
-      ed25519 (~> 1.2)
       sshkit (~> 1.21)
       thor (~> 1.2)
       zeitwerk (~> 2.5)
@@ -100,7 +98,9 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  bcrypt_pbkdf
   debug
+  ed25519
   mocha
   mrsk!
   railties

README.md

@@ -1,8 +1,6 @@
 # MRSK
 
-MRSK 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.
-
-Watch the screencast: https://www.youtube.com/watch?v=LL1cV2FXZ5I
+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. It was built for Rails applications, but works with any type of web app that can be bundled with Docker.
 
 ## Installation
 
@@ -33,39 +31,37 @@ 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 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`.
-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.
+9. Stop any containers running a previous versions of the app.
+10. Start a new container with the version of the app that matches the current git version hash.
 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.
 
 ## 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!
+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 our own hardware, or even just have a clear migration path to do so, you need to carefully consider how locked in you get to these commercial platforms. Preferably before the bills swallow your business whole!
 
-MRSK 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 MRSK, 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.
+MRSK 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 metal. To MRSK, 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.
+This structure also 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's a lot of compelling options available.
 
-Ultimately, MRSK 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 MRSK.
+Ultimately, MRSK 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, though. You're probably still better off with a fully managed service if basic Linux or Docker is still difficult, but from an early stage when those concepts are familiar.
 
 ## Why not just run Capistrano, Kubernetes or Docker Swarm?
 
-MRSK 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 MRSK, 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 MRSK can be used for CI or later introspection.
+MRSK basically is Capistrano for Containers, which allow us to use vanilla servers as the hosts. No need to ensure that the servers have just the right version of Ruby or other dependencies you need. That all lives in the Docker image now. You can boot a brand new Ubuntu (or whatever) server, add it to the deploy servers of MRSK, and it'll be auto-provisioned with Docker, and run right away. Docker's layer caching also allows for quicker deployments with less mucking about on the server. And the images built for MRSK can be used for CI or later introspection.
 
 Kubernetes is a beast. Running it yourself on your own hardware is not for the faint of heart. It's a fine option if you want to run on someone else's platform, either transparently [like Render](https://thenewstack.io/render-cloud-deployment-with-less-engineering/) or explicitly on AWS/GCP, but if you'd like the freedom to move between cloud and your own hardware, or even mix the two, MRSK is much simpler. You can see everything that's going on, it's just basic Docker commands being called.
 
-Docker Swarm is much simpler than Kubernetes, but it's still built on the same declarative model that uses state reconciliation. MRSK is intentionally designed 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.
+Docker Swarm is much simpler than Kubernetes, but it's still built on the same declarative model that uses state reconciliation. MRSK is intentionally designed to around imperative commands, like Capistrano.
 
 ## Configuration
 
@@ -78,71 +74,6 @@ 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 mrsk envify
-GITHUB_TOKEN=<%= `gh config get -h github.com oauth_token`.strip %>
-MRSK_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 `mrsk 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 `mrsk envify -d staging`.
-
-#### 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 mrsk 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 `mrsk envify` and mrsk will generate `.env` 
-
-
 ### Using another registry than Docker Hub
 
 The default registry is Docker Hub, but you can change it using `registry/server`:
@@ -150,14 +81,10 @@ The default registry is Docker Hub, but you can change it using `registry/server
 ```yaml
 registry:
   server: registry.digitalocean.com
-  username:  
-    - DOCKER_REGISTRY_TOKEN
-  password: 
-    - DOCKER_REGISTRY_TOKEN
+  username: registry-user-name
+  password: <%= ENV.fetch("MRSK_REGISTRY_PASSWORD") %>
 ```
 
-A reference to secret `DOCKER_REGISTRY_TOKEN` will look for `ENV["DOCKER_REGISTRY_TOKEN"]` on the machine running MRSK.
-
 ### Using a different SSH user than root
 
 The default SSH user is root, but you can change it using `ssh/user`:
@@ -282,30 +209,9 @@ servers:
       my-label: "50"
 ```
 
-### 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 ...`.
-
 ### 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, 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'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:
 
@@ -343,29 +249,9 @@ builder:
 
 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 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:
@@ -399,15 +285,6 @@ traefik:
 
 This will start the traefik container with `--accesslog=true accesslog.format=json`.
 
-### Traefik's host port binding
-
-By default Traefik binds to port 80 of the host machine, it can be configured to use an alternative port:
-
-```yaml
-traefik:
-  host_port: 8080
-```
-
 ### Configuring build args for new images
 
 Build arguments that aren't secret can also be configured:
@@ -421,6 +298,7 @@ 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
 ```
@@ -452,20 +330,22 @@ accessories:
 
 Now run `mrsk accessory start mysql` to start the MySQL server on 1.1.1.3. See `mrsk accessory` for all the commands possible.
 
-### Using Cron
+### Using a generated .env file
 
-You can use a specific container to run your Cron jobs:
+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:
 
-```yaml
-servers:
-  cron:
-    hosts:
-      - 192.168.0.1
-    cmd:
-      bash -c "cat config/crontab | crontab - && cron -f"
+```erb
+<% if (session_token = `op signin --account my-one-password-account --raw`.strip) != "" %># Generated by mrsk envify
+GITHUB_TOKEN=<%= `gh config get -h github.com oauth_token`.strip %>
+MRSK_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 assumes the Cron settings are stored in `config/crontab`.
+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.
+
+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 audit broadcasts
 

lib/mrsk/cli/accessory.rb

@@ -153,7 +153,9 @@ class Mrsk::Cli::Accessory < Mrsk::Cli::Base
   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) }
+      if options[:confirmed] || ask("This will remove all containers and images for all accessories. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
+        MRSK.accessory_names.each { |accessory_name| remove(accessory_name) }
+      end
     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"
         with_accessory(name) do

lib/mrsk/cli/app.rb

@@ -3,7 +3,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
   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} using a #{MRSK.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta
+      say "Start container with version #{version} (or reboot if already running)...", :magenta
 
       cli = self
       
@@ -14,7 +14,10 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
           begin
             old_version = capture_with_info(*MRSK.app.current_running_version).strip
             execute *MRSK.app.run(role: role.name)
+
+            cli.say "Waiting #{MRSK.config.readiness_delay}s for app to boot...", :magenta
             sleep MRSK.config.readiness_delay
+
             execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present?
 
           rescue SSHKit::Command::Failed => e

lib/mrsk/cli/main.rb

@@ -11,7 +11,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "deploy", "Deploy app to servers"
   def deploy
     runtime = print_runtime do
-      say "Ensure curl and Docker are installed...", :magenta
+      say "Ensure Docker is installed...", :magenta
       invoke "mrsk:cli:server:bootstrap"
 
       say "Log into image registry...", :magenta
@@ -55,7 +55,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
     MRSK.version = version
 
     if container_name_available?(MRSK.config.service_with_version)
-      say "Start version #{version}, then wait #{MRSK.config.readiness_delay}s for app to boot before stopping the old version...", :magenta
+      say "Start version #{version}, then stop the old version...", :magenta
 
       cli = self
 
@@ -64,6 +64,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
 
         execute *MRSK.app.start
 
+        cli.say "Waiting #{MRSK.config.readiness_delay}s for app to start...", :magenta
         sleep MRSK.config.readiness_delay
 
         execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false
@@ -142,10 +143,10 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   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
-    if options[:confirmed] || ask("This will remove all containers and images. Are you sure?", limited_to: %w( y N ), default: "N") == "y"
+    if options[:confirmed] || ask(remove_confirmation_question, limited_to: %w( y N ), default: "N") == "y"
       invoke "mrsk:cli:traefik:remove", [], options.without(:confirmed)
       invoke "mrsk:cli:app:remove", [], options.without(:confirmed)
-      invoke "mrsk:cli:accessory:remove", [ "all" ], options
+      invoke "mrsk:cli:accessory:remove", [ "all" ]
       invoke "mrsk:cli:registry:logout", [], options.without(:confirmed)
     end
   end
@@ -173,7 +174,7 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
   desc "registry", "Login and -out of the image registry"
   subcommand "registry", Mrsk::Cli::Registry
 
-  desc "server", "Bootstrap servers with curl and Docker"
+  desc "server", "Bootstrap servers with Docker"
   subcommand "server", Mrsk::Cli::Server
 
   desc "traefik", "Manage Traefik load balancer"
@@ -185,4 +186,10 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
       on(host) { container_names = capture_with_info(*MRSK.app.list_container_names).split("\n") }
       Array(container_names).include?(container_name)
     end
+
+    def remove_confirmation_question      
+      "This will remove all containers and images. " +
+      (MRSK.config.accessories.any? ? "Including #{MRSK.config.accessories.collect(&:name).to_sentence}. " : "") +
+      "Are you sure?"
+    end
 end

lib/mrsk/cli/server.rb

@@ -1,15 +1,6 @@
 class Mrsk::Cli::Server < Mrsk::Cli::Base
-  desc "bootstrap", "Ensure curl and Docker are installed on servers"
+  desc "bootstrap", "Ensure Docker is installed on servers"
   def bootstrap
-    on(MRSK.hosts + MRSK.accessory_hosts) do
-      dependencies_to_install = Array.new.tap do |dependencies|
-        dependencies << "curl" unless execute "which curl", raise_on_non_zero_exit: false
-        dependencies << "docker.io" unless execute "which docker", raise_on_non_zero_exit: false
-      end
-
-      if dependencies_to_install.any?
-        execute "apt-get update -y && apt-get install #{dependencies_to_install.join(" ")} -y)"
-      end
-    end
+    on(MRSK.hosts + MRSK.accessory_hosts) { execute "which docker || (apt-get update -y && apt-get install docker.io -y)" }
   end
 end

lib/mrsk/commander.rb

@@ -25,7 +25,7 @@ class Mrsk::Commander
   end
 
   def primary_host
-    specific_hosts&.first || config.primary_web_host
+    specific_hosts&.sole || config.primary_web_host
   end
 
   def hosts

lib/mrsk/commands/app.rb

@@ -10,7 +10,6 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       *role.env_args,
       *config.volume_args,
       *role.label_args,
-      *role.option_args,
       config.absolute_image,
       role.cmd
   end

lib/mrsk/commands/builder/base.rb

@@ -10,11 +10,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
   end
 
   def build_options
-    [ *build_tags, *build_labels, *build_args, *build_secrets, *build_dockerfile ]
-  end
-
-  def build_context
-    context
+    [ *build_tags, *build_labels, *build_args, *build_secrets ]
   end
 
   private
@@ -34,10 +30,6 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
       argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
     end
 
-    def build_dockerfile
-      argumentize "--file", dockerfile
-    end
-
     def args
       (config.builder && config.builder["args"]) || {}
     end
@@ -45,12 +37,4 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
     def secrets
       (config.builder && config.builder["secrets"]) || []
     end
-
-    def dockerfile
-      (config.builder && config.builder["dockerfile"]) || "Dockerfile"
-    end
-
-    def context
-      (config.builder && config.builder["context"]) || "."
-    end
 end

lib/mrsk/commands/builder/multiarch.rb

@@ -13,7 +13,7 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
       "--platform", "linux/amd64,linux/arm64",
       "--builder", builder_name,
       *build_options,
-      build_context
+      "."
   end
 
   def info

lib/mrsk/commands/builder/native.rb

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

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

@@ -17,7 +17,7 @@ class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
       "--platform", platform,
       "--builder", builder_name,
       *build_options,
-      build_context
+      "."
   end
 
   def info

lib/mrsk/commands/registry.rb

@@ -2,7 +2,7 @@ class Mrsk::Commands::Registry < Mrsk::Commands::Base
   delegate :registry, to: :config
 
   def login
-    docker :login, registry["server"], "-u", redact(lookup("username")), "-p", redact(lookup("password"))
+    docker :login, registry["server"], "-u", redact(registry["username"]), "-p", redact(lookup_password)
   end
 
   def logout
@@ -10,11 +10,11 @@ class Mrsk::Commands::Registry < Mrsk::Commands::Base
   end
 
   private
-    def lookup(key)
-      if registry[key].is_a?(Array)
-        ENV.fetch(registry[key].first).dup
+    def lookup_password
+      if registry["password"].is_a?(Array)
+        ENV.fetch(registry["password"].first).dup
       else
-        registry[key]
+        registry["password"]
       end
     end
 end

lib/mrsk/commands/traefik.rb

@@ -1,19 +1,15 @@
 class Mrsk::Commands::Traefik < Mrsk::Commands::Base
-  delegate :optionize, to: Mrsk::Utils
-
-  CONTAINER_PORT = 80
-
   def run
     docker :run, "--name traefik",
       "--detach",
       "--restart", "unless-stopped",
       "--log-opt", "max-size=#{MAX_LOG_SIZE}",
-      "--publish", port,
+      "--publish", "80:80",
       "--volume", "/var/run/docker.sock:/var/run/docker.sock",
       "traefik",
       "--providers.docker",
       "--log.level=DEBUG",
-      *cmd_option_args
+      *cmd_args
   end
 
   def start
@@ -49,20 +45,8 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
     docker :image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=Traefik"
   end
 
-  def port    
-    "#{host_port}:#{CONTAINER_PORT}"
-  end
-
   private
-    def cmd_option_args
-      if args = config.raw_config.dig(:traefik, "args")
-        optionize args
-      else
-        []
-      end
-    end
-
-    def host_port
-      config.raw_config.dig(:traefik, "host_port") || CONTAINER_PORT
+    def cmd_args
+      (config.raw_config.dig(:traefik, "args") || { }).collect { |(key, value)| [ "--#{key}", value ] }.flatten
     end
 end

lib/mrsk/configuration/role.rb

@@ -1,5 +1,5 @@
 class Mrsk::Configuration::Role
-  delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
+  delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
 
   attr_accessor :name
 
@@ -35,14 +35,6 @@ class Mrsk::Configuration::Role
     specializations["cmd"]
   end
 
-  def option_args
-    if args = specializations["options"]
-      optionize args
-    else
-      []
-    end
-  end
-
   def running_traefik?
     name.web? || specializations["traefik"]
   end

lib/mrsk/utils.rb

@@ -5,7 +5,7 @@ module Mrsk::Utils
   def argumentize(argument, attributes, redacted: false)
     Array(attributes).flat_map do |key, value|
       if value.present?
-        escaped_pair = [ key, escape_shell_value(value) ].join("=")
+        escaped_pair = [ key, value.to_s.dump.gsub(/`/, '\\\\`') ].join("=")
         [ argument, redacted ? redact(escaped_pair) : escaped_pair ]
       else
         [ argument, key ]
@@ -23,18 +23,8 @@ module Mrsk::Utils
     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)
-    args.collect { |(key, value)| [ "--#{key}", value == true ? nil : escape_shell_value(value) ] }.flatten.compact
-  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
-
-  # Escape a value to make it safe for shell use.
-  def escape_shell_value(value)
-    value.to_s.dump.gsub(/`/, '\\\\`')
-  end
 end

lib/mrsk/version.rb

@@ -1,3 +1,3 @@
 module Mrsk
-  VERSION = "0.9.0"
+  VERSION = "0.8.2"
 end

mrsk.gemspec

@@ -17,6 +17,4 @@ Gem::Specification.new do |spec|
   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"
 end

test/cli/main_test.rb

@@ -19,7 +19,7 @@ class CliMainTest < CliTestCase
     Mrsk::Cli::Main.any_instance.stubs(:container_name_available?).returns(true)
 
     run_command("rollback", "123").tap do |output|
-      assert_match /Start version 123/, output
+      assert_match /Start version 123, then stop the old version/, output
       assert_match /docker ps -q --filter label=service=app | xargs docker stop/, output
       assert_match /docker start app-123/, output
     end

test/cli/server_test.rb

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

test/commander_test.rb

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

test/commands/app_test.rb

@@ -34,15 +34,6 @@ class CommandsAppTest < ActiveSupport::TestCase
       @app.run.join(" ")
   end
 
-  test "run with custom options" do
-    @config[:servers] = { "web" => [ "1.1.1.1" ], "jobs" => { "hosts" => [ "1.1.1.2" ], "cmd" => "bin/jobs", "options" => { "mount" => "somewhere", "cap-add" => true } } }
-    @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",
-      @app.run(role: :jobs).join(" ")
-  end
-
   test "start" do
     assert_equal \
       "docker start app-999",

test/commands/builder_test.rb

@@ -9,7 +9,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
     builder = new_builder_command
     assert_equal "multiarch", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" .",
       builder.push.join(" ")
   end
 
@@ -17,7 +17,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
     builder = new_builder_command(builder: { "multiarch" => false })
     assert_equal "native", builder.name
     assert_equal \
-      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile . && docker push dhh/app:123",
+      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" . && docker push dhh/app:123",
       builder.push.join(" ")
   end
 
@@ -25,7 +25,7 @@ class CommandsBuilderTest < ActiveSupport::TestCase
     builder = new_builder_command(builder: { "local" => { }, "remote" => { } })
     assert_equal "multiarch/remote", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" .",
       builder.push.join(" ")
   end
 
@@ -33,56 +33,42 @@ class CommandsBuilderTest < ActiveSupport::TestCase
     builder = new_builder_command(builder: { "remote" => { "arch" => "amd64" } })
     assert_equal "native/remote", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64 --builder mrsk-app-native-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64 --builder mrsk-app-native-remote -t dhh/app:123 -t dhh/app:latest --label service=\"app\" .",
       builder.push.join(" ")
   end
 
   test "build args" do
     builder = new_builder_command(builder: { "args" => { "a" => 1, "b" => 2 } })
     assert_equal \
-      "-t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" --file Dockerfile",
+      "-t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\"",
       builder.target.build_options.join(" ")
   end
 
   test "build secrets" do
     builder = new_builder_command(builder: { "secrets" => ["token_a", "token_b"] })
     assert_equal \
-      "-t dhh/app:123 -t dhh/app:latest --label service=\"app\" --secret id=\"token_a\" --secret id=\"token_b\" --file Dockerfile",
+      "-t dhh/app:123 -t dhh/app:latest --label service=\"app\" --secret id=\"token_a\" --secret id=\"token_b\"",
       builder.target.build_options.join(" ")
   end
 
-  test "build dockerfile" do
-    builder = new_builder_command(builder: { "dockerfile" => "Dockerfile.xyz" })
-    assert_equal \
-      "-t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile.xyz",
-      builder.target.build_options.join(" ")
-  end
-
-  test "build context" do
-    builder = new_builder_command(builder: { "context" => ".." })
-    assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --file Dockerfile ..",
-      builder.push.join(" ")
-  end
-
   test "native push with build args" do
     builder = new_builder_command(builder: { "multiarch" => false, "args" => { "a" => 1, "b" => 2 } })
     assert_equal \
-      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" --file Dockerfile . && docker push dhh/app:123",
+      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" . && docker push dhh/app:123",
       builder.push.join(" ")
   end
 
   test "multiarch push with build args" do
     builder = new_builder_command(builder: { "args" => { "a" => 1, "b" => 2 } })
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder mrsk-app-multiarch -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --build-arg a=\"1\" --build-arg b=\"2\" .",
       builder.push.join(" ")
   end
 
   test "native push with with build secrets" do
     builder = new_builder_command(builder: { "multiarch" => false, "secrets" => [ "a", "b" ] })
     assert_equal \
-      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --secret id=\"a\" --secret id=\"b\" --file Dockerfile . && docker push dhh/app:123",
+      "docker build -t dhh/app:123 -t dhh/app:latest --label service=\"app\" --secret id=\"a\" --secret id=\"b\" . && docker push dhh/app:123",
       builder.push.join(" ")
   end
 

test/commands/registry_test.rb

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

test/commands/traefik_test.rb

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