squared 0.4.12 → 0.5.0

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

@@ -32,22 +32,24 @@ module Squared
                    no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
           }.freeze,
           container: {
-            run: %w[d|detach init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet
-                    read-only rm runtime t|tty add-host=q annotation=q a|attach=b blkio-weight-device=i cap-add=b
-                    cap-drop=b cgroup-parent=b cgroupns=b cidfile=p detach-keys=q 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 io-maxbandwidth=b io-maxiops=b 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 memory-swappiness=b mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b
-                    platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b sig-proxy=b?
-                    stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q user=e userns=b uts=b
-                    v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+            create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
+                       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=b
+                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
@@ -60,7 +62,8 @@ module Squared
           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].freeze,
+            save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
@@ -90,8 +93,8 @@ module Squared
         subtasks({
           'build' => %i[tag context bake].freeze,
           'compose' => %i[build run exec up].freeze,
-          'image' => %i[list rm push].freeze,
-          'container' => %i[run exec update commit inspect diff start stop restart pause unpause top stats kill
+          '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,
           'network' => %i[connect disconnect].freeze
         })
@@ -107,7 +110,8 @@ module Squared
           @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
-          @registry = [registry, kwargs[:username]].compact.join('/')
+          @registry = tagjoin registry, kwargs[:username]
+          @file = nil
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -174,7 +178,7 @@ module Squared
                           container(flag, args.extras, id: id)
                         end
                       end
-                    when :run
+                    when :run, :create
                       format_desc action, flag, 'image,opts*,args*'
                       task flag, [:image] do |_, args|
                         if args.image
@@ -194,15 +198,18 @@ 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
-                    when :list, :rm
-                      format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
+                    else
+                      format_desc(action, flag, case flag
+                                                when :rm, :save then 'id*,opts*'
+                                                when :tag then 'version?'
+                                                else 'opts*,args*' end)
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :rm && args.empty?
-                          choice_command :rm
+                        if args.empty? && flag != :list
+                          choice_command flag
                         else
                           image flag, args
                         end
@@ -260,10 +267,8 @@ module Squared
           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
@@ -287,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_escape(s) })
+            option(from == :bake ? 'target' : 'service', ignore: false) do |a|
+              ret.merge(split_escape(a).map! { |b| shell_escape(b) })
             end
           end
           ret
@@ -340,13 +345,15 @@ module Squared
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
+          rc = flag == :run || flag == :create
           list = OPT_DOCKER[:container].fetch(flag, [])
-          list += OPT_DOCKER[:container][:update] if flag == :run
-          op = OptionPartition.new(opts, list, cmd, project: self, args: flag == :run || flag == :exec)
+          list += OPT_DOCKER[:container][:create] if flag == :run
+          list += OPT_DOCKER[:container][:update] if rc
+          op = OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
           from = :"container:#{flag}"
           case flag
-          when :run, :exec
-            if flag == :run && !op.arg?('mount')
+          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) }
@@ -355,7 +362,7 @@ module Squared
                 args = []
                 tmpfs = true
                 val.split(delim).each do |opt|
-                  k, v, q = split_option(opt)
+                  k, v, q = split_option opt
                   next unless both.include?(k)
 
                   if k == 'type'
@@ -378,7 +385,7 @@ module Squared
                 cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
               end
             end
-            append_command(flag, id.to_s.empty? ? tagmain : id, op.extras, from: from)
+            append_command(flag, id || tagmain, op.extras, from: from)
           when :update
             raise_error('missing container', hint: from) if op.empty?
             op.append(escape: true)
@@ -442,7 +449,7 @@ module Squared
 
         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][flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
           exception = @exception
           banner = true
           from = :"image:#{flag}"
@@ -473,7 +480,7 @@ module Squared
               end
             else
               if op.empty?
-                list_image(flag, docker_output('image ls -a'), from: from) do |val|
+                list_image(:rm, docker_output('image ls -a'), from: from) do |val|
                   image(:rm, opts, sync: sync, id: val)
                 end
               else
@@ -481,13 +488,21 @@ module Squared
               end
               return
             end
+          when :tag, :save
+            list_image(flag, docker_output('image ls -a'), from: from) do |val|
+              op << val
+              if flag == :tag
+                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: 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)
@@ -497,7 +512,8 @@ module Squared
             exception = true
             banner = false
           end
-          run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          ret = run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          print_success if success?(ret) && (flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
@@ -587,18 +603,20 @@ module Squared
         end
 
         def append_tag(val, target: @session)
-          ver = option('version', target: target, ignore: false)
-          list = case val
-                 when String
-                   val.split(',')
-                 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
 
@@ -685,14 +703,14 @@ module Squared
 
         def choice_command(flag)
           msg, cmd, index = case flag
-                            when :run, :rm
-                              ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
                             when :bake
                               ['Choose a target', 'buildx bake --list=type=targets', 0]
-                            else
+                            when :connect, :disconnect
                               ['Choose a network', 'network ls', 0]
+                            else
+                              ['Choose an image', 'images -a', 2]
                             end
           lines = `#{docker_output(cmd)}`.lines
           header = lines.shift
@@ -702,25 +720,43 @@ module Squared
             puts " #  #{header}"
             multiple = false
             parse = ->(val) { val.split(/\s+/)[index] }
+            ctx = flag.to_s
             case flag
             when :run, :exec
               values = [['Options', flag == :run], ['Arguments', flag == :exec]]
-              cmd = flag.to_s
             when :rm, :bake
               values = ['Options']
               multiple = true
-              cmd = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
-            else
+              ctx = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
+            when :save
+              values = [['Output', true], 'Platform']
+              multiple = true
+            when :connect, :disconnect
               values = ['Options', ['Container', true]]
-              cmd = "network #{flag}"
+              ctx = "network #{flag}"
             end
             out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
-            ret = run docker_output(cmd, opts, '--', *(if out.is_a?(Array)
-                                                         out.map! { |val| parse.call(val) }
-                                                       else
-                                                         [parse.call(out)]
-                                                       end), args)
-            print_success if success?(ret && cmd.start_with?('network'))
+            cmd = docker_output ctx
+            case flag
+            when :tag
+              args = tagjoin @registry, @tag
+            when :save
+              opts = "#{opts}.tar" unless opts.end_with?('.tar')
+              cmd << quote_option('output', File.expand_path(opts))
+              if args
+                cmd << basic_option('platform', args)
+                args = nil
+              end
+            else
+              cmd << opts << '--'
+            end
+            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.start_with?(/(?:network|tag|save)/)
           end
         end
 
@@ -743,11 +779,17 @@ module Squared
           val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
+        def tagjoin(*args, char: '/')
+          args.compact!
+          args.join(char) unless args.empty?
+        end
+
         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)