capistrano-nomad 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0748cefe640533eb1e27bf32b49f399a59f481d9d6fc3a5526f32371bdaa49d
-  data.tar.gz: 2a440dc3cba7df056faba0aedc71ec9d3d5e089189697eb4d75a91a0636cc2e6
+  metadata.gz: d72090f2b054d4e263ca57df89aa4d5ae5c85dccfc9200313520cec17eeaef57
+  data.tar.gz: 854f1b1cde505d12cdd12f9acb2c31da2b9d60b24121a3e85d7277dd81bdc397
 SHA512:
-  metadata.gz: 1741648c6769f84e8ed3f2c5ad3f14a4ea742bc07be4b27f3fdc3b68af684a9b9c7a7346cf060f477ca576a7fc6ce1e775e8d1cf9f6dfdb173c5ed9c8047671b
-  data.tar.gz: 6ddb34c43f24c92b86f1fb9055c15e45ad851ebad706a750187c09f1f454f8d5102ee82bbddf66857d201ccc91657e043f34cf24e0f1a407ccb406b42f629bca
+  metadata.gz: d9d109aea1b53f1f383f40ed95136d56857f61ad4fe3c15097e7c40d6babb07e2c8d2bb76a7971f4a0ae0293738ab33f4b55b72b5fda85a174bff341a26ac1fc
+  data.tar.gz: 9c3671c5c5b4cfe2c29d81ba4b5b7ec7a96fd50648f062ad03aa8547214d3e69a7fe8ec0d641679e49d99e130e8587e78a1d8d7c5759c9118da1bccd02d65aec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-nomad (0.8.2)
+    capistrano-nomad (0.8.4)
       activesupport (<= 7.0.8)
       byebug
       capistrano (~> 3.0)

data/README.md

@@ -49,6 +49,19 @@ set :nomad_template_vars, (lambda do
   }
 end)
 
+# Change docker build command
+set :nomad_docker_build_command, (lambda do
+  "docker buildx build"
+end)
+
+# Pass additional options into `docker build`
+set :nomad_docker_build_command_options, (lambda do
+  [
+    "--cache-to type=gha",
+    "--cache-from type=gha",
+  ]
+end)
+
 # Make helpers available to all template .erb files
 nomad_template_helpers do
   def restart_stanza(interval = "1m")

data/capistrano-nomad.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "capistrano-nomad"
-  spec.version = "0.8.2"
+  spec.version = "0.8.4"
   spec.authors = ["James Hu"]
 
   spec.summary = "Capistrano plugin for deploying and managing Nomad jobs"

data/lib/capistrano/nomad/helpers/docker.rb

@@ -67,39 +67,42 @@ end
 def capistrano_nomad_build_docker_image_for_type(image_type)
   image_type = image_type.to_sym
   attributes = fetch(:nomad_docker_image_types)[image_type]
+  command = fetch(:nomad_docker_build_command) || "docker build"
+  options = Array(fetch(:nomad_docker_build_command_options)) || []
 
   return unless attributes
 
   # No need to build if there's no path
   return unless attributes[:path]
 
-  args = [
-    # Ensure images are built for x86_64 which is production env otherwise it will default to local development env
-    # which can be arm64 (Apple Silicon)
-    "--platform linux/amd64",
-  ]
+  # Ensure images are built for x86_64 which is production env otherwise it will default to local development env which
+  # can be arm64 (Apple Silicon)
+  options << "--platform linux/amd64"
 
   if (target = attributes[:target])
-    args << "--target #{target}"
+    options << "--target #{target}"
   end
 
   build_args = attributes[:build_args]
   build_args = build_args.call if build_args&.is_a?(Proc)
 
   (build_args || []).each do |key, value|
-    args << "--build-arg #{key}=#{value}"
+    # Escape single quotes so that we can properly pass in build arg values that have spaces and special characters
+    # e.g. Don't escape strings (#123) => $'Don\'t escape strings (#123)'
+    value_escaped = value.gsub("'", "\\\\'")
+    options << "--build-arg #{key}=$'#{value_escaped}'"
   end
 
   docker_build_command = lambda do |path|
-    image_alias_args = args.dup
+    build_options = options.dup
 
     [capistrano_nomad_build_docker_image_alias(image_type)]
       .compact
       .each do |tag|
-        image_alias_args << "--tag #{tag}"
+        build_options << "--tag #{tag}"
       end
 
-    "docker build #{image_alias_args.join(' ')} #{path}"
+    "#{command} #{build_options.join(' ')} #{path}"
   end
 
   case attributes[:strategy]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nomad
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport