squared 0.4.38 → 0.5.0

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

@@ -4,82 +4,76 @@ module Squared
   module Workspace
     module Project
       class Docker < Base
-        COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml docker-compose.yml].freeze
+        COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml compose.yml docker-compose.yml].freeze
         BAKEFILE = %w[docker-bake.json docker-bake.hcl docker-bake.override.json docker-bake.override.hcl].freeze
-        DIR_DOCKER = (COMPOSEFILE + BAKEFILE + ['Dockerfile']).freeze
+        DIR_DOCKER = (COMPOSEFILE + BAKEFILE).freeze
         OPT_DOCKER = {
           common: %w[tls tlsverify config=p c|context=b D|debug H|host=q l|log-level=b tlscacert=p tlscert=p
                      tlskey=p].freeze,
           buildx: {
             common: %w[builder=b D|debug],
-            build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
-                      cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q
-                      q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
-            bake: %w[print list=q set=q].freeze,
-            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
-                       sbom=q].freeze
+            build: %w[load pull push add-host=q annotation=q attest=q build-arg=qq ent=q iidfile=p label=q a-file=p
+                      network=b no-cache-filter=b o|output=q platform=b q|quiet secret=qq shm-size=b ssh=qq t|tag=b
+                      target=b ulimit=q].freeze,
+            bake: %w[load print pull push list=q metadata-file=p set=q].freeze,
+            shared: %w[check no-cache allow=q call=b? f|file=p progress=b provenance=q sbom=q].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources compatibility dry-run ansi=b env-file=p f|file=p parallel=n profile=b progress=b
+            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
-                      provenance=q sbom=q ssh=qq].freeze,
-            exec: %w[d|detach privileged e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
-            run: %w[build d|detach no-deps q|quiet quiet-build quiet-pull remove-orphans rm P|service-ports use-aliases
-                    cap-add=b cap-drop=b entrypoint=q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b
-                    T|no-TTY=b? p|publish=q pull=b u|user=e v|volume=q w|workdir=q].freeze,
-            up: %w[abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
-                   d|detach force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start quiet-build
-                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch y|yes attach=b
-                   exit-code-from=b no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze,
-            down: %w[remove-orphans v|volumes rmi=b t|timeout=i].freeze
+            build: %w[no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b ssh=qq].freeze,
+            exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
+            run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
+                    d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
+                    u|user=e v|volume=q w|workdir=q].freeze,
+            up: %w[y abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
+                   d|detach dry-run force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start
+                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch attach=b exit-code-from=b
+                   no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       rm t|tty use-api-socket add-host=q annotation=q a|attach=b blkio-weight=i blkio-weight-device=i
-                       cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p device=q device-cgroup-rule=q
-                       device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q
-                       disable-content-trust=b? dns=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq
-                       env-file=p expose=q gpus=q group-add=b health-cmd=q health-interval=b health-retries=i
-                       health-start-interval=q health-start-period=q health-timeout=q hostname=q io-maxbandwidth=b
-                       io-maxiops=b ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b
-                       link-local-ip=q log-driver=b log-opt=q mac-address=q m|memory=b memory-reservation=b
-                       memory-swap=n memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b
-                       pid=b pids-limit=n platform=q p|publish=q pull=b restart=b runtime=b security-opt=q shm-size=b
-                       stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b
-                       v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q
+                       a|attach=b blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b
+                       cidfile=p device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
+                       device-write-iops=q disable-content-trust=b? dns=e dns-option=e dns-search=e domainname=b
+                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b
+                       health-retries=i health-start-interval=b health-start-period=b health-timeout=b h|hostname=e ip=b
+                       ip6=e ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b
+                       log-driver=b log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n
+                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
+                       platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
+                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
+                       volume-driver=b volumes-from=b w|workdir=q].freeze,
             run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
+                     w|workdir=q].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
                        cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
-                     w|workdir=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
-            inspect: %w[s|size f|format=q type=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 t|timeout=i].freeze,
-            restart: %w[s|signal=b t|time=i t|timeout=i].freeze,
+            stop: %w[s|signal=b t|time=i].freeze,
+            restart: %w[s|signal=b t|time=i].freeze,
             kill: %w[s|signal=b].freeze,
-            stats: %w[a|all no-stream no-trunc format|q].freeze
+            stats: %w[no-trunc format|q].freeze
           }.freeze,
           image: {
-            list: %w[a|all q|quiet digests no-trunc tree f|filter=q format=q].freeze,
-            push: %w[a|all-tags disable-content-trust=b? platform=q q|quiet].freeze,
-            rm: %w[f|force no-prune platform=q].freeze,
-            save: %w[o|output=p platform=q].freeze
+            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,
+            save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
-            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
+            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
             disconnect: %w[f|force].freeze
           }.freeze
         }.freeze
         VAL_DOCKER = {
           run: {
-            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
+            bind: %w[type source src destination dst target readonly ro bind-propagation].freeze,
+            tmpfs: %w[type destination dst target tmpfs-size tmpfs-mode].freeze
           }.freeze
         }.freeze
         private_constant :COMPOSEFILE, :BAKEFILE, :OPT_DOCKER, :VAL_DOCKER
@@ -92,14 +86,13 @@ module Squared
           def config?(val)
             return false unless (val = as_path(val))
 
-            DIR_DOCKER.any? { |file| val.join(file).exist? }
+            val.join('Dockerfile').exist? || DIR_DOCKER.any? { |file| val.join(file).exist? }
           end
         end
 
         subtasks({
-          'build' => %i[tag context].freeze,
-          'compose' => %i[build run exec up down].freeze,
-          'bake' => %i[build check].freeze,
+          'build' => %i[tag context bake].freeze,
+          'compose' => %i[build run exec up].freeze,
           'image' => %i[list rm push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
@@ -114,10 +107,11 @@ module Squared
           return unless dockerfile(file).exist?
 
           @context = context
-          self.tag = tag || tagname("#{@project}:#{@version || 'latest'}")
+          @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
           @registry = tagjoin registry, kwargs[:username]
+          @file = nil
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -130,11 +124,11 @@ module Squared
 
         def populate(*, **)
           super
-          return unless ref?(Docker.ref) || @only
+          return unless ref?(Docker.ref)
 
           namespace name do
             Docker.subtasks do |action, flags|
-              next if task_pass?(action)
+              next if @pass.include?(action)
 
               namespace action do
                 flags.each do |flag|
@@ -147,39 +141,26 @@ module Squared
                         param = param_guard(action, flag, args: args, key: flag)
                         buildx(:build, args.extras, "#{flag}": param)
                       end
-                    end
-                  when 'bake'
-                    break unless bake?
-
-                    case flag
-                    when :build
-                      format_desc action, flag, 'opts*,target*,context?|:'
+                    when :bake
+                      format_desc action, flag, ':?,opts*,target*,context?'
                       task flag do |_, args|
                         args = args.to_a
                         if args.first == ':'
                           choice_command :bake
                         else
-                          buildx :bake, args
+                          buildx flag, args
                         end
                       end
-                    when :check
-                      format_desc action, flag, 'target'
-                      task flag, [:target] do |_, args|
-                        target = param_guard(action, flag, args: args, key: :target)
-                        buildx :bake, ['allow=fs.read=*', 'call=check', target]
-                      end
                     end
                   when 'compose'
-                    break unless compose?
-
                     case flag
-                    when :build, :up, :down
+                    when :build, :up
                       format_desc action, flag, 'opts*,service*'
                       task flag do |_, args|
                         compose! flag, args.to_a
                       end
                     when :exec, :run
-                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'}|:,args*,opts*"
+                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
                         compose!(flag, args.extras, service: service)
@@ -207,7 +188,7 @@ module Squared
                         end
                       end
                     else
-                      format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
+                      format_desc(action, flag, 'opts*,id/name', after: flag == :update ? '+' : '*')
                       task flag do |_, args|
                         container flag, args.to_a
                       end
@@ -217,15 +198,14 @@ module Squared
                     when :push
                       format_desc action, flag, 'tag,registry/username?,opts*'
                       task flag, [:tag] do |_, args|
-                        tag = param_guard(action, flag, args: args, key: :tag)
-                        image(flag, args.extras, id: tag)
+                        id = param_guard(action, flag, args: args, key: :tag)
+                        image(flag, args.extras, id: id)
                       end
                     else
                       format_desc(action, flag, case flag
                                                 when :rm, :save then 'id*,opts*'
                                                 when :tag then 'version?'
-                                                else 'opts*,args*'
-                                                end)
+                                                else 'opts*,args*' end)
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? && flag != :list
@@ -252,44 +232,43 @@ module Squared
         end
 
         def clean(*, sync: invoked_sync?('clean'), **)
-          if runnable?(@clean)
-            super
-          elsif sync || option('y', prefix: 'docker')
-            image :rm
-          end
+          return super unless @clean.nil?
+
+          image(:rm, sync: sync)
         end
 
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
           return opts if script == false
 
+          ret = docker_session
           if from == :run
-            if bake?(n = filetype)
-              ret = docker_session 'buildx bake'
+            case (n = filetype)
+            when 1, 2
+              ret << 'buildx' << 'bake'
               append_file n
               from = :bake
-            elsif compose?(n)
-              ret = docker_session 'compose build'
+            when 3, 4
+              ret << 'compose' << 'build'
               append_file n
               from = :compose
             else
-              ret = docker_session 'build'
+              ret << 'build'
             end
           else
-            ret = docker_session from
+            ret << from
           end
           case opts
           when String
             ret << opts
           when Hash
-            ret.merge(append_hash(opts, target: [], build: true))
+            ret.merge(append_hash(opts, build: true))
           when Enumerable
             ret.merge(opts.to_a)
           end
+
           [args, flags].each_with_index do |target, index|
-            if target.is_a?(String)
-              ret << target
-            elsif (target = append_any(target, target: []))
-              ret.merge(target.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
+            if (data = append_any(target, target: []))
+              ret.merge(data.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
             end
           end
           case from
@@ -299,12 +278,12 @@ module Squared
               ret << quote_option('secret', @secrets, double: true)
             when Hash
               append = lambda do |type|
-                Array(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
+                as_a(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
               end
               append.call(:file)
               append.call(:env)
             else
-              Array(@secrets).each { |arg| ret << quote_option('secret', arg) }
+              as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
             if (val = option('tag', ignore: false))
               append_tag val
@@ -313,8 +292,8 @@ module Squared
             end
             append_context
           when :bake, :compose
-            if (val = option(from == :bake ? 'target' : 'service', ignore: false))
-              ret.merge(split_escape(val).map! { |s| shell_quote(s) })
+            option(from == :bake ? 'target' : 'service', ignore: false) do |a|
+              ret.merge(split_escape(a).map! { |b| shell_escape(b) })
             end
           end
           ret
@@ -327,11 +306,22 @@ module Squared
           op.parse(OPT_DOCKER[:buildx][flag == :bake ? :bake : :build] + OPT_DOCKER[:buildx][:shared])
           case flag
           when :build, :context
-            append_tag(tag || option('tag', ignore: false) || self.tag)
+            append_tag(tag || option('tag', ignore: false) || @tag)
             append_context context
           when :bake
-            op.append(escape: true, strip: /^:/, clear: true)
-            op.push(context) if context
+            unless op.empty?
+              args = op.dup
+              op.extras.clear
+              if Dir.exist?(args.last)
+                if projectpath?(val = args.pop)
+                  context = val
+                else
+                  op.extras << val
+                end
+              end
+              op.append(args, escape: true)
+              contextdir context if context
+            end
           end
           op.clear(pass: false)
           run(from: :"buildx:#{flag}")
@@ -342,16 +332,16 @@ module Squared
           op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
           append_file filetype unless op.arg?('f', 'file')
           op << flag
-          op.parse(OPT_DOCKER[:compose].fetch(flag, []))
+          op.parse(OPT_DOCKER[:compose][flag])
+          from = :"compose:#{flag}"
           case flag
-          when :build, :up, :down
-            op.append(escape: true, strip: /^:/)
+          when :build, :up
+            op.append(escape: true)
           when :exec, :run
-            append_command flag, service, op.extras
+            append_command(flag, service, op.extras, from: from)
           end
-          run(from: :"compose:#{flag}")
+          run(from: from)
         end
-        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
@@ -364,54 +354,45 @@ module Squared
           case flag
           when :run, :create, :exec
             if rc && !op.arg?('mount')
-              all = collect_hash VAL_DOCKER[:run]
-              delim = Regexp.new(",\\s*(?=#{all.join('|')})")
-              Array(@mounts).each do |val|
+              run = VAL_DOCKER[:run]
+              both = run[:bind] + run[:tmpfs]
+              diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
+              delim = Regexp.new(",\\s*(?=#{both.join('|')})")
+              as_a(@mounts).each do |val|
                 args = []
-                type = nil
+                tmpfs = true
                 val.split(delim).each do |opt|
                   k, v, q = split_option opt
-                  if k == 'type'
-                    case v
-                    when 'bind', 'volume', 'image', 'tmpfs'
-                      type = v
-                    else
-                      raise_error("unknown type: #{v}", hint: flag)
-                    end
-                  elsif all.include?(k)
-                    unless type
-                      VAL_DOCKER[:run].each_pair do |key, a|
-                        next unless a.include?(k)
+                  next unless both.include?(k)
 
-                        type = key.to_s unless key == :common
-                        break
-                      end
-                    end
-                    case k
-                    when 'readonly', 'ro'
-                      args << k
-                      next
-                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      v = basepath 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)
+                  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'
+                  end
+                  args << "#{k}=#{q + v + q}"
                 end
-                raise_error('missing type', hint: flag) unless type
-                cmd << "--mount type=#{type},#{args.join(',')}"
+                cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
               end
             end
-            append_command(flag, id || tagmain, op.extras)
+            append_command(flag, id || tagmain, op.extras, from: from)
           when :update
-            raise_error('missing container', hint: flag) if op.empty?
-            op.append(escape: true, strip: /^:/)
+            raise_error('missing container', hint: from) if op.empty?
+            op.append(escape: true)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
-            raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
+            raise_error("unknown args: #{op.join(', ')}", hint: from) unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
             registry = option('registry') || @registry
@@ -454,13 +435,13 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *status.map { |s| quote_option('filter', "status=#{s}") })
+              ps = docker_output('ps -a', *status.map { |s| "--filter=\"status=#{s}\"" })
               list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
               return
             else
-              op.append(escape: true, strip: /^:/)
+              op.append(escape: true)
             end
           end
           run(from: from)
@@ -511,17 +492,17 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{project}:#{op.first}")
+                op << tagname("#{@project}:#{op.extras.first}")
                 break
               end
             end
           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: flag) unless id && op.empty?
-            raise_error('username/registry not provided', hint: flag) unless 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
             registry.chomp!('/')
-            uri = shell_quote("#{registry}/#{id}")
+            uri = shell_quote "#{registry}/#{id}"
             op << uri
             img = docker_output 'image', 'tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
@@ -537,7 +518,7 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:network][flag], cmd, project: self)
           op.clear
           from = :"network:#{flag}"
           list_image(flag, docker_output('ps -a'), from: from) do |img|
@@ -553,28 +534,17 @@ module Squared
           super || dockerfile.exist?
         end
 
-        def compose?(file = dockerfile)
-          return file == 3 || file == 4 if file.is_a?(Numeric)
-
-          COMPOSEFILE.include?(File.basename(file))
-        end
-
-        def bake?(file = dockerfile)
-          return file == 1 || file == 2 if file.is_a?(Numeric)
-
-          BAKEFILE.include?(File.basename(file))
-        end
-
         def dockerfile(val = nil)
-          if val
+          if val == 'Dockerfile'
+            @file = false
+          elsif val
             @file = if val.is_a?(Array)
                       val = val.select { |file| basepath(file).exist? }
                       val.size > 1 ? val : val.first
-                    elsif val == true
-                      DIR_DOCKER.find { |file| basepath(file).exist? }
-                    elsif val != 'Dockerfile'
-                      val
+                    else
+                      val || DIR_DOCKER.find { |file| basepath(file).exist? }
                     end
+            @file ||= false
           end
           basepath((@file.is_a?(Array) ? @file.first : @file) || 'Dockerfile')
         end
@@ -593,42 +563,35 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, val, list, target: @session)
-          if list.delete(':')
-            list << readline('Enter command [args]', force: true)
-          elsif (args = env('DOCKER_ARGS'))
+        def append_command(flag, val, list, target: @session, from: nil)
+          if (args = env('DOCKER_ARGS'))
             list << args
           end
           case flag
           when :run
             unless session_arg?('name', target: target)
-              target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
+              target << basic_option('name', dnsname("#{name}_%s" % if RUBY_VERSION >= '3.1'
+                                                                      require 'random/formatter'
+                                                                      Random.new.alphanumeric(6)
+                                                                    else
+                                                                      (0...6).map { rand(97..122).chr }.join
+                                                                    end))
             end
           when :exec
-            raise_error('no command args', hint: flag) if list.empty?
+            raise_error('no command args', hint: from) if list.empty?
           end
           target << val << list.shift
           target << list.join(' && ') unless list.empty?
         end
 
-        def append_file(type, target: @session, index: 2)
-          return if !@file || (ENV['COMPOSE_FILE'] && compose?(type))
+        def append_file(type, target: @session)
+          return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          unless @file.is_a?(Array)
-            case type
-            when 2, 4
-              return
-            when 3
-              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
-            end
-          end
-          files = Array(@file).map { |val| quote_option('file', basepath(val)) }
+          files = as_a(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
-            opts = target.to_a.insert(index, *files)
-            target.clear
-                  .merge(opts)
+            target.merge(files)
           else
-            target.insert(index, *files)
+            target.concat(files)
           end
         end
 
@@ -640,28 +603,30 @@ module Squared
         end
 
         def append_tag(val, target: @session)
-          ver = option('version', target: target, ignore: false)
-          list = case val
-                 when String
-                   split_escape val
-                 when Array
-                   val
-                 else
-                   []
-                 end
-          list.each do |s|
-            s = "#{s.sub(/:latest$/, '')}:#{ver}" if ver && (!s.include?(':') || s.end_with?(':latest'))
-            target << basic_option('tag', tagname(s))
+          case val
+          when String
+            val.split(',')
+          when Array
+            val
+          else
+            []
+          end.yield_self do |list|
+            ver = option('version', target: target, ignore: false)
+            list.each do |s|
+              s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+              target << basic_option('tag', tagname(s))
+            end
+            target
           end
         end
 
-        def list_image(flag, cmd, hint: nil, no: true, from: nil)
-          pwd_set(from: from) do
+        def list_image(flag, cmd, hint: nil, from: nil, no: true)
+          pwd_set do
             found = false
             index = 0
             all = option('all', prefix: 'docker')
             y = from == :'image:rm' && option('y', prefix: 'docker')
-            pat = /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})\b/
+            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -698,7 +663,7 @@ module Squared
                 cols.each do |key|
                   next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
 
-                  puts "#{g + f} #{key}: #{Array(data[key]).join(', ')}" unless data[key].to_s.empty?
+                  puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
                 end
                 w = 9 + flag.to_s.size + 4 + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
@@ -710,10 +675,14 @@ module Squared
               end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: name, hint: hint || from) if !found && !y
+            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
           end
         rescue StandardError => e
-          on_error e, from
+          log.error e
+          ret = on(:error, from, e)
+          raise if exception && ret != true
+
+          warn log_message(Logger::WARN, e, pass: true) if warning?
         end
 
         def confirm_command(*args, title: nil, target: nil, as: nil)
@@ -770,7 +739,7 @@ module Squared
             cmd = docker_output ctx
             case flag
             when :tag
-              args = tagjoin @registry, tag
+              args = tagjoin @registry, @tag
             when :save
               opts = "#{opts}.tar" unless opts.end_with?('.tar')
               cmd << quote_option('output', File.expand_path(opts))
@@ -781,9 +750,13 @@ module Squared
             else
               cmd << opts << '--'
             end
-            cmd.merge(Array(out).map! { |val| parse.call(val) })
+            cmd.merge(if out.is_a?(Array)
+                        out.map! { |val| parse.call(val) }
+                      else
+                        [parse.call(out)]
+                      end)
             cmd << args
-            print_success if success?(run(cmd)) && ctx.match?(/\A(?:network|tag|save)/)
+            print_success if success?(run(cmd)) && ctx.start_with?(/(?:network|tag|save)/)
           end
         end
 
@@ -793,7 +766,7 @@ module Squared
             bake?(val) ? 1 : 2
           when '.yml', '.yaml'
             if compose?(val)
-              @only&.include?('compose') || path.children.none? { |file| bake?(file) } ? 3 : 1
+              path.children.any? { |file| bake?(file) } ? 1 : 3
             else
               4
             end
@@ -803,7 +776,7 @@ module Squared
         end
 
         def contextdir(val = nil)
-          val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
+          val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
         def tagjoin(*args, char: '/')
@@ -813,9 +786,10 @@ module Squared
 
         def tagname(val)
           val = val.split(':').map! { |s| charname(s.sub(/^\W+/, '')) }
-          ret = val.join(':')
-          ret = val.first if val.size > 1 && ret.size > 128
-          ret[0..127]
+          val.join(':').yield_self do |s|
+            s = val.first if val.size > 1 && s.size > 128
+            s[0..127]
+          end
         end
 
         def dnsname(val)
@@ -829,6 +803,14 @@ 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