mrsk 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb523ac89ed682e739e8312da6ee60bc45baace7f1d3b836d3fb62b9c75539f
-  data.tar.gz: 5f3552e54648aa2f0c7c795b921c0523a3deca6aeb22d5bd2fa6901dec169e33
+  metadata.gz: 0e810a4dc3e4a8e859440ab1902e51ada21f3267b5687efd3fb344d9d8d6af20
+  data.tar.gz: 1fbef83c2a77a821b011d43c22243e34bf8f0b631011441532b369b3a175e7da
 SHA512:
-  metadata.gz: afd16123f8681337a1f30c0908221b96c8e9540485126f20a63741ed524bd9f282cc7bdaa1aad50f61f68887f7fe1176435f5dd2f58605780de2866ee141c40c
-  data.tar.gz: e40f284df37ec58990c4a2e2ebd8765641eb797fb83abeed8d02aa857dd40a079793a62c5c98bfe3204c9bddeb8ebf1e2a33dde09cf337050cb4283eb05485df
+  metadata.gz: 18b1110d168d3cb05daece74232d31dbca6008d68f041aa4d90dd56b48422ded2df552d133dd3c0bf6e5a19de297e9f6e0eb1c84190fc42b700a81940b7bb406
+  data.tar.gz: 4c2f34570b9c3d193b874625afd8067aa271ee10556f0c756b8246d1cb93eec591b73ae7ae43eb3bc6713d24f14ee96e1b0e2c237ff0320ac75919e09132a792

data/README.md

@@ -43,11 +43,13 @@ This will:
 
 Voila! All the servers are now serving the app on port 80. If you're just running a single server, you're ready to go. If you're running multiple servers, you need to put a load balancer in front of them.
 
-## Why not just run Capistrano or Kubernetes?
+## Why not just run Capistrano, Kubernetes or Docker Swarm?
 
 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, 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.
+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 to around imperative commands, like Capistrano.
 
 ## Configuration
 
@@ -247,14 +249,15 @@ 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
+# Install dependencies, including private repositories via access token (then remove git configs with exposed GITHUB_TOKEN)
 RUN --mount=type=secret,id=GITHUB_TOKEN \
   BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
-  bundle install
+  bundle install && \
+  find /usr/local/bundle/cache/bundler/git -name "config" -delete
 ```
 
 ### Using command arguments for Traefik

data/lib/mrsk/cli/app.rb

@@ -1,11 +1,6 @@
 class Mrsk::Cli::App < Mrsk::Cli::Base
   desc "boot", "Boot app on servers (or reboot app if already running)"
   def boot
-    cli = self
-
-    say "Ensure no other version of the app is running...", :magenta
-    stop
-
     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
@@ -15,12 +10,14 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
           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
 
-              cli.remove_container version
+              execute *MRSK.app.remove_container(version: version)
               execute *MRSK.app.run(role: role.name)
             else
               raise

data/lib/mrsk/commander.rb

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

data/lib/mrsk/commands/accessory.rb

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

data/lib/mrsk/commands/app.rb

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

data/lib/mrsk/commands/base.rb

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

data/lib/mrsk/commands/builder/base.rb

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

data/lib/mrsk/commands/builder/multiarch.rb

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

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

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

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

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

data/lib/mrsk/commands/prune.rb

@@ -2,8 +2,8 @@ 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
+  PRUNE_IMAGES_AFTER     = 7.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"

data/lib/mrsk/commands/traefik.rb

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

data/lib/mrsk/configuration.rb

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

data/lib/mrsk/version.rb

@@ -1,3 +1,3 @@
 module Mrsk
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrsk
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,5 +146,5 @@ requirements: []
 rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
-summary: Deploy Rails apps in containers to servers running Docker with zero downtime.
+summary: Deploy web apps in containers to servers running Docker with zero downtime.
 test_files: []