squared 0.6.20 → 0.7.0

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

@@ -16,30 +16,31 @@ module Squared
                       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=qq call=b? f|file=p metadata-file=p progress=b provenance=b?
-                       sbom=b?].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
           }.freeze,
           compose: {
-            common: %w[1 all-resources compatibility dry-run ansi=b env-file=p f|file=p parallel=n profile=b progress=b
-                       project-directory=p p|project-name=b].freeze,
+            common: %w[all-resources ansi|b compatibility dry-run env-file=p f|file=p parallel=n 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,
             create: %w[build force-recreate no-build no-recreate quiet-pull remove-orphans y|yes pull=b scale=i].freeze,
-            exec: %w[d|detach privileged e|env=qq index=i T|no-tty=!? user=b w|workdir=q].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=!? p|publish=q pull=b u|user=b v|volume=qq w|workdir=q].freeze,
+                    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
+            down: %w[remove-orphans v|volumes rmi=b t|timeout=i].freeze,
+            publish: %w[app resolve-image-digests with-env y|yes oci-version=b].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
+                       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
                        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
@@ -47,14 +48,13 @@ module Squared
                        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=qq volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       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,
             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=n pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty=!? detach-keys=q e|env=qq env-file=p u|user=b
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=e
                      w|workdir=q].freeze,
-            rm: %w[f|force l|link v|volumes].freeze,
             commit: %w[no-pause a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q type=b].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
@@ -65,6 +65,7 @@ module Squared
           }.freeze,
           image: {
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
+            pull: %w[a|all-tags platform=q q|quiet].freeze,
             push: %w[a|all-tags platform=q q|quiet].freeze,
             rm: %w[f|force no-prune platform=q].freeze,
             save: %w[o|output=p platform=q].freeze
@@ -77,10 +78,10 @@ module Squared
         VAL_DOCKER = {
           run: {
             common: %w[source src destination dst target readonly ro].freeze,
-            bind: %w[bind-create-src bind-propagation].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-subpath].freeze
+            image: %w[image-path].freeze
           }.freeze,
           ls: {
             compose: %w[Name Image Command Service RunningFor Status Ports CreatedAt ExitCode Health ID Labels
@@ -108,9 +109,9 @@ module Squared
 
         subtasks({
           'build' => %i[tag context].freeze,
-          'compose' => %i[build create run exec up down service].freeze,
-          'bake' => %i[build check].freeze,
-          'image' => %i[ls rm push tag save].freeze,
+          'compose' => %i[build create publish run exec up down service].freeze,
+          'bake' => %i[build compose check].freeze,
+          'image' => %i[ls rm pull push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
           'network' => %i[connect disconnect].freeze,
@@ -120,17 +121,19 @@ module Squared
         attr_reader :context
         attr_accessor :tag
 
-        def initialize(*, file: nil, context: nil, tag: nil, secrets: nil, mounts: [], registry: nil, **kwargs)
+        def initialize(*, mounts: [], **kwargs)
           super
-          return unless dockerfile(file).exist?
+          self.global = nil
+          return unless dockerfile(kwargs[:file]).exist?
 
-          @context = context
-          self.tag = tag || tagname("#{@project}:#{@version || 'latest'}")
+          self.tag = kwargs[:tag] || tagname("#{@project}:#{@version || 'latest'}")
+          @context = kwargs[:context]
           @mounts = mounts
-          @secrets = secrets
-          @registry = tagjoin registry, kwargs[:username]
+          @secrets = kwargs[:secrets]
+          @registry = tagjoin kwargs[:registry], kwargs[:username]
+          @oci = tagjoin kwargs[:oci], kwargs[:username]
           initialize_ref Docker.ref
-          initialize_logger(**kwargs)
+          initialize_logger kwargs[:log]
           initialize_env(**kwargs)
           @output[4] = merge_opts(kwargs[:args], @output[4]) if kwargs[:args]
         end
@@ -164,25 +167,21 @@ module Squared
                                                  end
                     cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    cols = if has_value!(args, 's', 'standard')
-                             data.first(data.index('CreatedAt'))
-                           else
-                             [].tap do |out|
-                               args.each do |val|
-                                 if val =~ /^(\d+)$/
-                                   out << data[$1.to_i.pred]
-                                 elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
-                                   j = $1.to_i.pred
-                                   k = $3.to_i - ($2 == '..' ? 2 : 1)
-                                   out.concat(data[j..k]) if k > j
-                                 end
-                               end
-                               next unless out.empty?
-
-                               out.replace(choice_index('Select a column', data, multiple: true, attempts: 1))
-                             end
-                           end
-                    cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
+                    if has_value!(args, 's', 'standard')
+                      cols = data.first(data.index('CreatedAt'))
+                    else
+                      cols = args.each_with_object([]) do |val, out|
+                        if val =~ /^(\d+)$/
+                          out << data[$1.to_i.pred]
+                        elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
+                          j = $1.to_i.pred
+                          k = $3.to_i - ($2 == '..' ? 2 : 1)
+                          out.concat(data[j..k]) if k > j
+                        end
+                      end
+                      cols = choice_index('Select a column', data, multiple: true, attempts: 1) if cols.empty?
+                    end
+                    cmd << quote_option('format', "table #{cols.map { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
                 end
@@ -200,14 +199,14 @@ module Squared
                       break unless bake?
 
                       case flag
-                      when :build
-                        format_desc action, flag, 'opts*,target*,context|:'
+                      when :build, :compose
+                        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(:bake, args, from: (:'buildx:bake' if flag == :compose))
                           end
                         end
                       when :check
@@ -240,6 +239,13 @@ module Squared
                             compose!(flag, [command], service: service.empty? || service)
                           end
                         end
+                      when :publish
+                        next unless @oci
+
+                        format_desc action, flag, 'tag?,repository?,opts*'
+                        task flag, [:tag] do |_, args|
+                          compose! flag, args.to_a
+                        end
                       else
                         format_desc action, flag, 'opts*,service*|:'
                         task flag do |_, args|
@@ -268,7 +274,7 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{flag == :update || flag == :inspect ? '+' : '*'}"
+                        format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
                         task flag do |_, args|
                           container flag, args.to_a
                         end
@@ -276,6 +282,13 @@ module Squared
                     when 'image'
                       case flag
                       when :push
+                        next unless @registry
+
+                        format_desc action, flag, 'tag?,registry/username?,opts*'
+                        task flag, [:tag] do |_, args|
+                          image flag, args.to_a
+                        end
+                      when :pull
                         format_desc action, flag, 'tag,registry/username?,opts*'
                         task flag, [:tag] do |_, args|
                           id = param_guard(action, flag, args: args, key: :tag)
@@ -283,18 +296,14 @@ module Squared
                         end
                       else
                         format_desc(action, flag, case flag
-                                                  when :rm, :save then 'id,opts*'
-                                                  when :tag then 'version'
+                                                  when :rm, :save then 'id*,opts*'
+                                                  when :tag then 'version?'
                                                   else 'opts*,args*'
-                                                  end, before: 'pattern?')
+                                                  end)
                         task flag do |_, args|
                           args = args.to_a
-                          n = args.size
-                          if (n > 1 || (flag == :ls && n > 0)) && OptionPartition.pattern?(args.first)
-                            filter = args.shift
-                          end
                           if !args.empty? || flag == :ls
-                            image(flag, args, filter: filter)
+                            image flag, args
                           else
                             choice_command flag
                           end
@@ -320,8 +329,8 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          elsif sync || option('y', prefix: 'docker')
-            image :rm
+          else
+            image(:rm, sync: sync)
           end
         end
 
@@ -354,7 +363,7 @@ module Squared
           [args, flags].each_with_index do |item, i|
             next unless item && (data = append_any(item, target: []))
 
-            ret.merge(data.map! { |arg| i == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
+            ret.merge(data.map { |arg| i == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
           end
           case from
           when :run
@@ -362,13 +371,13 @@ module Squared
             when String
               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) }
+              append = lambda do |key|
+                ret.merge(Array(@secrets[key]).map { |arg| quote_option('secret', "type=#{key},#{arg}", double: true) })
               end
               append.call(:file)
               append.call(:env)
             else
-              Array(@secrets).each { |arg| ret << quote_option('secret', arg) }
+              ret.merge(Array(@secrets).map { |arg| quote_option('secret', arg) })
             end
             if (val = option('tag', ignore: false))
               append_tag val
@@ -382,40 +391,38 @@ module Squared
           ret
         end
 
-        def buildx(flag, opts = [], tag: nil, context: nil)
+        def buildx(flag, opts = [], tag: nil, context: nil, from: nil)
           cmd, opts = docker_session('buildx', opts: opts)
-          op = OPT_DOCKER[:buildx].yield_self do |data|
-            OptionPartition.new(opts, data[:common], cmd, project: self)
-                           .append(flag, quote: false)
-                           .parse(data[flag == :bake ? :bake : :build] + data[:shared])
-          end
+          data = OPT_DOCKER[:buildx]
+          op = OptionPartition.new(opts, data[:common], cmd, project: self)
+          op.append(flag, quote: false)
+            .parse(data[flag == :bake ? :bake : :build] + data[:shared])
           case flag
           when :build, :context
             append_tag(tag || option('tag', ignore: false) || self.tag)
             append_context context
           when :bake
-            if op.first == '-'
-              op.shift
-              op << @output[4] if @output[4]
-            end
+            append_file(0, index: 3) unless from || op.arg?('f', 'file') || !anypath?(*COMPOSEFILE)
             unless op.empty?
-              if !context && op.size > 1 && basepath(op.last).directory?
-                pat = /\btarget\s+"#{Regexp.escape(op.last)}"/
-                context = op.pop if op.values_of('f', 'file').none? { |f| basepath!(f)&.read&.match?(pat) }
-              end
-              if context
-                context = basepath context
-                op.each { |name| op.add_option('set', "#{name}.context=#{context}", escape: false) }
+              args = op.dup
+              op.reset
+              if Dir.exist?(args.last)
+                if projectpath?(val = args.pop)
+                  context = val
+                else
+                  op.push(val)
+                end
               end
-              op.append(escape: true, strip: /^:/, clear: true)
+              op.append(args, escape: true, strip: /^:/)
+              contextdir context if context
             end
           end
           op.clear(pass: false)
-          run(from: :"buildx:#{flag}")
+          run(from: from || symjoin('buildx', flag))
         end
 
-        def compose!(flag, opts = [], service: nil, multiple: false)
-          from = :"compose:#{flag}"
+        def compose!(flag, opts = [], id: nil, service: nil, multiple: false)
+          from = symjoin 'compose', flag
           if flag == :service
             command = opts.first
             if service == true
@@ -429,99 +436,94 @@ module Squared
           else
             cmd, opts = docker_session('compose', opts: opts)
             op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
-            append_file filetype unless op.arg?('f', 'file')
+            append_file(filetype, force: flag == :publish) unless op.arg?('f', 'file')
             op << flag
             op.parse(OPT_DOCKER[:compose].fetch(flag, []))
-            if op.remove(':') || service == ':'
-              keys = Set.new
-              read_composefile('services', target: op.values_of('f', 'file')) { |data| keys.merge(data.keys) }
-              service = unless keys.empty?
-                          choice_index('Add services', keys, multiple: multiple, force: !multiple,
-                                                             attempts: multiple ? 1 : 3)
-                        end
-            end
-            if multiple
-              op.concat(service) if service
-              op.append(delim: true, escape: true, strip: /^:/)
+            if flag == :publish
+              id ||= option('tag', ignore: false) || op.shift || tagmain
+              registry ||= option('registry') || op.shift || @oci
+              emptyargs op, flag
+              op << shell_quote(tagjoin(registry, id))
+              return unless confirm_command(op.to_s, title: from, target: id)
             else
-              raise_error ArgumentError, 'no service was selected', hint: flag unless service
-              append_command(flag, service, op.extras, prompt: '::')
+              if op.remove(':') || service == ':'
+                keys = Set.new
+                read_composefile('services', target: op.values_of('f', 'file')) { |data| keys.merge(data.keys) }
+                service = unless keys.empty?
+                            choice_index('Add services', keys, multiple: multiple, force: !multiple,
+                                                               attempts: multiple ? 1 : 3)
+                          end
+              end
+              if multiple
+                op.concat(service) if service
+                op.append(delim: true, escape: true, strip: /^:/)
+              else
+                raise_error ArgumentError, 'no service was selected', hint: flag unless service
+                append_command(flag, service, op.extras, prompt: '::')
+              end
             end
           end
           run(from: from)
         end
-        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
-          rc = flag == :run || flag == :create
-          op = OPT_DOCKER[:container].yield_self do |data|
-            list = data.fetch(flag, [])
-            list += data[:create] if flag == :run
-            list += data[:update] if rc
-            OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
-          end
-          from = :"container:#{flag}"
+          data = OPT_DOCKER[:container]
+          list = data.fetch(flag, [])
+          list += data[:create] if (rc = flag == :run)
+          list += data[:update] if rc ||= flag == :create
+          op = OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
+          from = symjoin 'container', flag
           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|
-                args = []
                 type = nil
-                val.split(delim).each do |opt|
-                  k, v, q = split_option opt
+                args = val.split(delim).each_with_object([]) do |opt, out|
+                  k, v, q = OptionPartition.parse_option(opt)
                   if k == 'type'
                     case v
                     when 'bind', 'volume', 'image', 'tmpfs'
                       type = v
                     else
-                      raise_error TypeError, "unknown: #{v}", hint: flag
+                      raise_error TypeError, "unknown: #{v || "''"}", hint: flag
                     end
                   elsif all.include?(k)
                     unless type
-                      VAL_DOCKER[:run].each_pair do |key, a|
-                        next unless a.include?(k)
+                      VAL_DOCKER[:run].each_pair do |key, items|
+                        next unless items.include?(k)
 
                         type = key.to_s unless key == :common
                         break
                       end
                     end
                     case k
-                    when 'readonly', 'ro', 'volume-nocopy', 'bind-create-src'
-                      args << k if %w[bind volume].include?(type)
+                    when 'readonly', 'ro'
+                      out << k
                       next
-                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-subpath'
-                      raise_error ArgumentError, "no path value: #{k}", hint: flag unless v
-                      case k
-                      when 'source', 'src'
-                        if type == 'bind'
-                          v = basepath v
-                        elsif type == 'tmpfs'
-                          next
-                        end
-                      when 'destination', 'dst', 'target'
-                        puts log_message("path is not absolute: #{v}", subject: from, hint: k) unless v.start_with?('/')
-                      end
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
+                      raise_error ArgumentError, "#{k}: no path value", hint: flag unless v
+                      v = basepath v
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
-                    args << "#{k}=#{q + v + q}"
+                    out << "#{k}=#{q}#{v}#{q}"
                   elsif !silent?
-                    puts log_message('unrecognized option', subject: from, hint: k)
+                    log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
                 raise_error TypeError, 'none specified', hint: flag unless type
-                op << "--mount type=#{type},#{args.join(',')}"
+                cmd << "--mount type=#{type},#{args.join(',')}"
               end
             end
             append_command(flag, id || tagmain, op.extras)
-          when :update, :inspect
+          when :update
             raise_error ArgumentError, 'missing container', hint: flag if op.empty?
             op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
-            op << id << latest
+            cmd << id << latest
             raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
@@ -532,7 +534,7 @@ module Squared
             opts = []
             append_option('platform', target: opts, equals: true)
             opts << case option('disable-content-trust', ignore: false)
-                    when 'false', '0'
+                    when '0', 'false'
                       '--disable-content-trust=false'
                     else
                       '--disable-content-trust'
@@ -542,7 +544,7 @@ module Squared
           else
             if op.empty?
               ps, status, no = filter_ps flag, from
-              op << '--no-stream' if flag == :stats
+              cmd << '--no-stream' if flag == :stats
               list_image(flag, ps, no: no, hint: status, from: from) { |img| run(cmd.temp(img), from: from) }
               return
             end
@@ -551,12 +553,12 @@ module Squared
           run(from: from)
         end
 
-        def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
+        def image(flag, opts = [], sync: true, id: nil, registry: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
-          exception = self.exception
+          exception = exception?
           banner = true
-          from = :"image:#{flag}"
+          from = symjoin 'image', flag
           case flag
           when :ls
             if opts.size == op.size
@@ -569,7 +571,7 @@ module Squared
                 opts.delete(val)
                 break
               end
-              list_image(:run, filter: filter, from: from) do |val|
+              list_image(:run, from: from) do |val|
                 container(:run, if name
                                   opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
                                 else
@@ -583,7 +585,7 @@ module Squared
           when :rm
             unless id
               if op.empty?
-                list_image(:rm, filter: filter, from: from) { |val| image(:rm, opts, sync: sync, id: val) }
+                list_image(:rm, from: from) { |val| image(:rm, opts, sync: sync, id: val) }
               else
                 op.each { |val| run(cmd.temp(val), sync: sync, from: from) }
               end
@@ -595,51 +597,48 @@ module Squared
               banner = false
             end
           when :tag, :save
-            found = false
-            list_image(flag, filter: filter, from: from) do |val|
+            list_image(flag, from: from) do |val|
               op << val
-              found = true
-              if flag == :tag
-                op << tagname("#{project}:#{op.first}")
-                break
-              end
+              next unless flag == :tag
+
+              op << tagname("#{project}:#{op.first}")
+              break
             end
-            raise_error ArgumentError, 'target not specified', hint: flag unless found
-          when :push
-            id ||= option('tag', ignore: false) || tagmain
-            registry ||= op.shift || option('registry') || @registry
-            unless id && op.empty?
-              if id
-                raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag
-              else
-                raise_error 'no id/tag', hint: flag
-              end
+          when :pull
+            if !id
+              id = tagmain
+            elsif !op.arg?('a', 'all-tags') && !id.include?(':')
+              id = "#{project}:#{id}"
+            end
+            unless registry
+              registry = op.shift
+              registry ||= option('registry') || @registry unless id.include?('/')
             end
+            cmd << shell_quote(tagjoin(registry, id))
+          when :push
+            id ||= option('tag', ignore: false) || op.shift || tagmain
+            registry ||= option('registry') || op.shift || @registry
+            emptyargs op, flag
             raise_error ArgumentError, 'username/registry not specified', hint: flag unless registry
-            registry.chomp!('/')
-            uri = shell_quote "#{registry}/#{id}"
+            uri = shell_quote tagjoin(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)
 
-            cmd = img
+            @session = img
             sync = false
-            exception = true
+            exception ||= true
             banner = false
           end
-          run(cmd, sync: sync, exception: exception, banner: banner, from: from).tap do |ret|
-            success?(ret, flag == :tag || flag == :save)
-          end
+          success?(run(sync: sync, exception: exception, banner: banner, from: from), flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
           OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
                          .clear
-          from = :"network:#{flag}"
-          list_image(flag, docker_output('ps -a'), from: from) do |img|
-            success?(run(cmd.temp(target, img), from: from))
-          end
+          from = symjoin 'network', flag
+          list_image(flag, docker_output('ps -a'), from: from) { |id| success?(run(cmd.temp(target, id), from: from)) }
         end
 
         def build?
@@ -688,7 +687,7 @@ module Squared
             elsif (data = doc.dig(*keys))
               yield data
             end
-          rescue StandardError => e
+          rescue => e
             log.debug e
           end
         end
@@ -705,11 +704,11 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, prompt: ':')
-          if list.delete(prompt)
-            list << readline('Enter command [args]', force: flag == :exec)
-          else
-            env('DOCKER_ARGS') { |args| list << args }
-          end
+          list << if list.delete(prompt)
+                    readline('Enter command [args]', force: flag == :exec)
+                  else
+                    env('DOCKER_ARGS')
+                  end
           case flag
           when :run
             unless session_arg?('name', target: target)
@@ -718,28 +717,14 @@ module Squared
           when :exec
             raise_error ArgumentError, 'nothing to execute', hint: flag if list.empty?
           end
-          target << val
-          case list.first
-          when '--'
-            target.merge(list.drop(1))
-          when /\A(--|&&)(\s|\z)/
-            target.merge(list)
-          else
-            target << list.shift
-            unless list.empty?
-              if list.first.start_with?('-')
-                target.merge(list)
-              else
-                target << list.join(' && ')
-              end
-            end
-          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, index: 2, force: false)
+          return unless @file && !(ENV['COMPOSE_FILE'] && compose?(type))
 
-          unless @file.is_a?(Array)
+          unless @file.is_a?(Array) || force
             case type
             when 2, 4
               return
@@ -747,14 +732,7 @@ module Squared
               return unless COMPOSEFILE.select { |val| basepath!(val) }.size > 1
             end
           end
-          files = Array(@file).map { |val| quote_option('file', basepath(val)) }
-          if target.is_a?(Set)
-            opts = target.to_a.insert(index, *files)
-            target.clear
-                  .merge(opts)
-          else
-            target.insert(index, *files)
-          end
+          target.insert(index, *Array(@file).map { |val| quote_option('file', basepath(val)) })
         end
 
         def append_context(ctx = nil, target: @session)
@@ -768,7 +746,7 @@ module Squared
           ver = option('version', target: target, ignore: false)
           case val
           when String
-            split_escape val
+            val.split(',')
           else
             Array(val)
           end.each do |s|
@@ -807,20 +785,12 @@ module Squared
           [cmd, status, no]
         end
 
-        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, from: nil)
+        def list_image(flag, cmd = docker_output('image ls -a'), hint: nil, no: true, from: nil)
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
             y = from == :'image:rm' && option('y', prefix: 'docker')
-            filter = env('DOCKER_FILTER', filter).to_s
-            pat = if OptionPartition.pattern?(filter)
-                    Regexp.new(filter)
-                  elsif filter.match?(/[:_-]$/)
-                    /\b#{Regexp.escape(filter)}/
-                  else
-                    filter = filter.empty? ? '(?:[:_-]|$)' : "[:_-]#{filter}"
-                    /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
-                  end
+            pat = /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})\b/
             IO.popen(cmd.temp('--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -869,7 +839,7 @@ module Squared
             end
             list_empty(hint: hint || from) if index == 1 && !y
           end
-        rescue StandardError => e
+        rescue => e
           on_error e, from
         end
 
@@ -903,11 +873,11 @@ module Squared
                      when :service
                        ['Choose a service',
                         'compose ps -a ' \
-                        '--format="table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}"']
+                        "--format='table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}'"]
                      else
                        ['Choose an image',
                         'images -a ' \
-                        '--format="table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}"']
+                        "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
                      end
           lines = `#{docker_output(cmd)}`.lines
           if lines.size <= 1
@@ -941,18 +911,18 @@ module Squared
           when :tag
             args = tagjoin @registry, tag
           when :save
-            opts = "#{opts}.tar" unless opts.end_with?('.tar')
+            opts = opts.sub_ext('.tar')
             cmd << quote_option('output', File.expand_path(opts))
             if args
-              cmd << basic_option('platform', args)
+              cmd << quote_option('platform', args)
               args = nil
             end
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map! { |val| val.split(/\s+/, 2).first })
+          cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
           cmd << args
-          success?(run(cmd, { 'NO_COLOR' => 'true' }), ctx.start_with?(/network|tag|save/))
+          success?(run(cmd), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)
@@ -975,11 +945,12 @@ module Squared
         end
 
         def tagjoin(*args, char: '/')
-          args.join(char) unless (args = args.compact).empty?
+          args.compact!
+          args.map { |val| val.chomp(char) }.join(char) unless args.empty?
         end
 
         def tagname(val)
-          val = val.split(':').map! { |s| charname(s.sub(/^\W+/, '')) }
+          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]
@@ -996,6 +967,14 @@ module Squared
         def tagmain
           tag.is_a?(Array) ? tag.first : tag
         end
+
+        def emptyargs(list, hint = nil)
+          raise_error ArgumentError, "unrecognized args: #{list.join(', ')}", hint: hint unless list.empty?
+        end
+
+        def anypath?(*args)
+          args.any? { |val| basepath!(val) }
+        end
       end
 
       Application.implement Docker