mrsk 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb523ac89ed682e739e8312da6ee60bc45baace7f1d3b836d3fb62b9c75539f
-  data.tar.gz: 5f3552e54648aa2f0c7c795b921c0523a3deca6aeb22d5bd2fa6901dec169e33
+  metadata.gz: 957bd15fa5ddbd2b63c0f264cb92ccb3288ba956d0ba371fcfa752bd75604e6c
+  data.tar.gz: 14826e53ee7534b3a25efe4671e7325486e377f4313cbe991348d119059070b3
 SHA512:
-  metadata.gz: afd16123f8681337a1f30c0908221b96c8e9540485126f20a63741ed524bd9f282cc7bdaa1aad50f61f68887f7fe1176435f5dd2f58605780de2866ee141c40c
-  data.tar.gz: e40f284df37ec58990c4a2e2ebd8765641eb797fb83abeed8d02aa857dd40a079793a62c5c98bfe3204c9bddeb8ebf1e2a33dde09cf337050cb4283eb05485df
+  metadata.gz: 8020ed616daa525d17cec2d638abb7707a0daae8acf320f72a488609d8eaee64a65f708b17aa84f9d87e939f8e608298a31cbbe090f34000885d6a5702cf601a
+  data.tar.gz: 4e1a952fa22de6cba2c71983686d274b1d4fab3153b2db40859a4a3d03b49ac9676ee0d782892a812c55a39788d39c55b948456d59a43dea462c0106b777e6aa

data/README.md

@@ -43,12 +43,14 @@ 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.
 
+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
 
 ### Using .env file to load required environment variables

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

@@ -91,7 +91,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/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, "-t", config.absolute_image, *build_args, *build_secrets, "."),
       docker(:push, config.absolute_image)
   end
 

data/lib/mrsk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mrsk
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-02-07 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: []