squared 0.4.16 → 0.4.18

data/lib/squared/workspace/project/docker.rb

@@ -55,15 +55,15 @@ module Squared
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
-            stop: %w[s|signal=b t|time=i].freeze,
-            restart: %w[s|signal=b t|time=i].freeze,
+            stop: %w[s|signal=b t|time=i t|timeout=i].freeze,
+            restart: %w[s|signal=b t|time=i t|timeout=i].freeze,
             kill: %w[s|signal=b].freeze,
             stats: %w[no-trunc format|q].freeze
           }.freeze,
           image: {
             list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
             push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
-            rm: %w[f|force no-prune].freeze,
+            rm: %w[f|force no-prune platform=b].freeze,
             save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
@@ -73,8 +73,11 @@ module Squared
         }.freeze
         VAL_DOCKER = {
           run: {
-            bind: %w[type source src destination dst target readonly ro bind-propagation].freeze,
-            tmpfs: %w[type destination dst target tmpfs-size tmpfs-mode].freeze
+            common: %w[source src destination dst target readonly ro].freeze,
+            bind: %w[bind-propagation].freeze,
+            volume: %w[volume-subpath volume-nocopy volume-opt].freeze,
+            tmpfs: %w[tmpfs-size tmpfs-mode].freeze,
+            image: %w[image-path].freeze
           }.freeze
         }.freeze
         private_constant :COMPOSEFILE, :BAKEFILE, :OPT_DOCKER, :VAL_DOCKER
@@ -92,7 +95,7 @@ module Squared
         end
 
         subtasks({
-          'build' => %i[tag context bake].freeze,
+          'build' => %i[tag context].freeze,
           'compose' => %i[build run exec up].freeze,
           'bake' => %i[build check].freeze,
           'image' => %i[list rm push tag save].freeze,
@@ -125,7 +128,7 @@ module Squared
 
         def populate(*, **)
           super
-          return unless ref?(Docker.ref)
+          return unless ref?(Docker.ref) || @only
 
           namespace name do
             Docker.subtasks do |action, flags|
@@ -134,7 +137,7 @@ module Squared
               namespace action do
                 flags.each do |flag|
                   case action
-                  when 'build', 'bake'
+                  when 'build'
                     case flag
                     when :tag, :context
                       format_desc(action, flag, 'opts*', before: flag == :tag ? 'name' : 'dir')
@@ -142,9 +145,12 @@ module Squared
                         param = param_guard(action, flag, args: args, key: flag)
                         buildx(:build, args.extras, "#{flag}": param)
                       end
-                    when :bake, :build
-                      next unless bake?
+                    end
+                  when 'bake'
+                    break unless bake?
 
+                    case flag
+                    when :build
                       format_desc action, flag, ':?,opts*,target*,context?'
                       task flag do |_, args|
                         args = args.to_a
@@ -155,8 +161,6 @@ module Squared
                         end
                       end
                     when :check
-                      next unless bake?
-
                       format_desc action, flag, 'target'
                       task flag, [:target] do |_, args|
                         target = param_guard(action, flag, args: args, key: :target)
@@ -164,6 +168,8 @@ module Squared
                       end
                     end
                   when 'compose'
+                    break unless compose?
+
                     case flag
                     when :build, :up
                       format_desc action, flag, 'opts*,service*'
@@ -350,7 +356,7 @@ module Squared
           when :build, :up
             op.append(escape: true)
           when :exec, :run
-            append_command(flag, service, op.extras, from: from)
+            append_command flag, service, op.extras
           end
           run(from: from)
         end
@@ -367,44 +373,54 @@ module Squared
           when :run, :create, :exec
             if rc && !op.arg?('mount')
               run = VAL_DOCKER[:run]
-              both = run[:bind] + run[:tmpfs]
-              diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
-              delim = Regexp.new(",\\s*(?=#{both.join('|')})")
+              all = collect_hash VAL_DOCKER[:run]
+              delim = Regexp.new(",\\s*(?=#{all.join('|')})")
               Array(@mounts).each do |val|
                 args = []
-                tmpfs = true
+                type = nil
                 val.split(delim).each do |opt|
-                  k, v, q = split_option(opt)
-                  next unless both.include?(k)
-
+                  k, v, q = split_option opt
                   if k == 'type'
-                    tmpfs = false if v == 'bind'
-                    next
-                  elsif diff.include?(k)
-                    tmpfs = false
-                  end
-                  case k
-                  when 'readonly', 'ro'
-                    args << k
-                    next
-                  when 'source', 'src', 'destination', 'dst', 'target'
-                    v = path + v
-                    v = shell_quote(v, option: false, force: false) if q == ''
-                    tmpfs = false if k[0] == 's'
+                    case v
+                    when 'bind', 'volume', 'image', 'tmpfs'
+                      type = v
+                    else
+                      raise_error("unknown type: #{v}", hint: flag)
+                    end
+                  elsif all.include?(k)
+                    unless type
+                      run.each_pair do |key, val|
+                        if val.include?(k)
+                          type = key.to_s unless key == :common
+                          break
+                        end
+                      end
+                    end
+                    case k
+                    when 'readonly', 'ro'
+                      args << k
+                      next
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
+                      v = path + v
+                      v = shell_quote(v, option: false, force: false) if q == ''
+                    end
+                    args << "#{k}=#{q + v + q}"
+                  elsif verbose
+                    log_message(Logger::INFO, 'unrecognized option', subject: from, hint: k)
                   end
-                  args << "#{k}=#{q + v + q}"
                 end
-                cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
+                raise_error('missing type', hint: flag) unless type
+                cmd << "--mount type=#{type},#{args.join(',')}"
               end
             end
-            append_command(flag, id || tagmain, op.extras, from: from)
+            append_command(flag, id || tagmain, op.extras)
           when :update
-            raise_error('missing container', hint: from) if op.empty?
+            raise_error('missing container', hint: flag) if op.empty?
             op.append(escape: true)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
-            raise_error("unknown args: #{op.join(', ')}", hint: from) unless op.empty?
+            raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
             registry = option('registry') || @registry
@@ -447,7 +463,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *status.map { |s| "--filter=\"status=#{s}\"" })
+              ps = docker_output('ps -a', *status.map { |s| quote_option('filter', "status=#{s}") })
               list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
@@ -511,8 +527,8 @@ module Squared
           when :push
             id ||= option('tag', ignore: false) || tagmain
             registry ||= op.shift || option('registry') || @registry
-            raise_error(id ? "unknown args: #{op.join(', ')}" : 'no id/tag given', hint: from) unless id && op.empty?
-            raise_error('username/registry not provided', hint: from) unless registry
+            raise_error(id ? "unknown args: #{op.join(', ')}" : 'no id/tag given', hint: flag) unless id && op.empty?
+            raise_error('username/registry not provided', hint: flag) unless registry
             registry.chomp!('/')
             uri = shell_quote("#{registry}/#{id}")
             op << uri
@@ -546,6 +562,14 @@ module Squared
           super || dockerfile.exist?
         end
 
+        def compose?(file = dockerfile)
+          COMPOSEFILE.include?(File.basename(file))
+        end
+
+        def bake?(file = dockerfile)
+          BAKEFILE.include?(File.basename(file))
+        end
+
         def dockerfile(val = nil)
           if val == 'Dockerfile'
             @file = false
@@ -575,7 +599,7 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, val, list, target: @session, from: nil)
+        def append_command(flag, val, list, target: @session)
           if list.delete(':')
             list << readline('Enter command [args]', force: true)
           elsif (args = env('DOCKER_ARGS'))
@@ -587,7 +611,7 @@ module Squared
               target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
-            raise_error('no command args', hint: from) if list.empty?
+            raise_error('no command args', hint: flag) if list.empty?
           end
           target << val << list.shift
           target << list.join(' && ') unless list.empty?
@@ -633,7 +657,7 @@ module Squared
             index = 0
             all = option('all', prefix: 'docker')
             y = from == :'image:rm' && option('y', prefix: 'docker')
-            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
+            pat = /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})\b/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -682,7 +706,7 @@ module Squared
               end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
+            puts log_message(Logger::INFO, 'none detected', subject: name, hint: hint || from) if !found && !y
           end
         rescue StandardError => e
           on_error e, from
@@ -801,14 +825,6 @@ module Squared
         def tagmain
           tag.is_a?(Array) ? tag.first : tag
         end
-
-        def compose?(file = dockerfile)
-          COMPOSEFILE.include?(File.basename(file))
-        end
-
-        def bake?(file = dockerfile)
-          BAKEFILE.include?(File.basename(file))
-        end
       end
 
       Application.implement Docker