squared 0.8.1 → 0.8.3

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

@@ -13,11 +13,11 @@ module Squared
           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
+                      cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q q|quiet
+                      resource=q secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
+            bake: %w[print list=q set=qq var=qq].freeze,
+            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p policy=q progress=b
+                       provenance=q sbom=q].freeze
           }.freeze,
           compose: {
             common: %w[all-resources ansi=b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
@@ -34,7 +34,8 @@ module Squared
                    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,
-            publish: %w[app resolve-image-digests with-env y|yes oci-version=b].freeze
+            publish: %w[app resolve-image-digests with-env y|yes oci-version=b].freeze,
+            logs: %w[dry-run f|follow no-color no-log-prefix t|timestamps index=i since=q n|tail=b until=q].freeze
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
@@ -55,8 +56,9 @@ module Squared
                        restart=q].freeze,
             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,
-            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,
+            commit: %w[no-pause a|author=q c|change=q m|message=q].freeze,
+            logs: %w[details f|follow t|timestamps since=q n|tail=b until=q].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|timeout=i].freeze,
             restart: %w[s|signal=b t|timeout=i].freeze,
@@ -65,11 +67,14 @@ module Squared
             attach: %w[no-stdin detach-keys=q sig-proxy=!?].freeze
           }.freeze,
           image: {
+            common: %w[platform=q].freeze,
+            inspect: %w[f|format].freeze,
+            history: %w[f|format no-trunc q|quiet H|human=!?].freeze,
             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
+            pull: %w[a|all-tags q|quiet].freeze,
+            push: %w[a|all-tags q|quiet].freeze,
+            rm: %w[f|force no-prune].freeze,
+            save: %w[o|output=p].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
@@ -112,10 +117,10 @@ module Squared
 
         subtasks({
           'build' => %i[tag context].freeze,
-          'compose' => %i[build create publish run exec up down service].freeze,
+          'compose' => %i[build create publish run exec up down logs service].freeze,
           'bake' => %i[build compose check].freeze,
-          'image' => %i[ls rm pull push tag save].freeze,
-          'container' => %i[attach commit create diff exec inspect kill pause restart rm run start stats stop top
+          'image' => %i[ls rm pull push tag save inspect history].freeze,
+          'container' => %i[attach commit create diff exec logs top inspect kill pause restart rm run start stats stop
                             unpause update].freeze,
           'network' => %i[connect disconnect create].freeze,
           'ls' => nil
@@ -124,13 +129,31 @@ module Squared
         attr_reader :context
         attr_accessor :tag
 
-        def initialize(*, mounts: [], **kwargs)
+        def initialize(*, client: nil, mounts: [], **kwargs)
           super
           self.global = nil
           return unless dockerfile(kwargs[:file]).exist?
 
           @tag = kwargs[:tag] || tagname("#{@project}:#{@version || 'latest'}")
           @context = kwargs[:context]
+          @client = if client
+                      opts = []
+                      client.each do |key, val|
+                        val = case (key = key.to_s)
+                              when 'config'
+                                basepath!(val, type: 'd')
+                              when 'tlscacert', 'tlscert', 'tlskey'
+                                basepath!(val, type: 'f')
+                              when 'context', 'host', 'log-level'
+                                quote_option(key, val)
+                              when 'debug', 'tls', 'tlsverify'
+                                opts << key
+                                next
+                              end
+                        opts << quote_option(key, val) if val
+                      end
+                      opts unless opts.empty?
+                    end
           @mounts = mounts
           @secrets = kwargs[:secrets]
           @registry = tagjoin kwargs[:registry], kwargs[:username]
@@ -278,7 +301,11 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
+                        format_desc action, flag, "opts*,id/name#{case flag
+                                                                  when :stats then '*'
+                                                                  when :logs, :diff, :attach, :top then nil
+                                                                  else '+'
+                                                                  end}"
                         task flag do |_, args|
                           container flag, args.to_a
                         end
@@ -289,7 +316,7 @@ module Squared
                         next unless @registry
 
                         format_desc action, flag, 'tag?,registry/username?,opts*'
-                        task flag, [:tag] do |_, args|
+                        task flag do |_, args|
                           image flag, args.to_a
                         end
                       when :pull
@@ -298,6 +325,16 @@ module Squared
                           id = param_guard(action, flag, args: args, key: :tag)
                           image(flag, args.extras, id: id)
                         end
+                      when :inspect, :history
+                        format_desc action, flag, "opts*,id#{'+' if flag == :inspect}"
+                        task flag do |_, args|
+                          args = args.to_a
+                          if args.empty?
+                            choice_command :image, flag
+                          else
+                            image flag, args.to_a
+                          end
+                        end
                       else
                         format_desc(action, flag, case flag
                                                   when :rm, :save then 'id,opts*'
@@ -380,11 +417,9 @@ module Squared
             when String
               ret << quote_option('secret', @secrets, double: true)
             when Hash
-              append = lambda do |key|
+              %i[file env].each 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
               ret.merge(Array(@secrets).map { |arg| quote_option('secret', arg) })
             end
@@ -412,7 +447,7 @@ module Squared
             .parse(data[flag == :bake ? :bake : :build] + (shared || data[:shared]))
           case flag
           when :build, :context
-            append_tag(tag || option('tag', ignore: false) || self.tag)
+            append_tag tag || option('tag', ignore: false) || self.tag
             if shared
               op.add_quote(context, preserve: false)
             else
@@ -429,7 +464,7 @@ module Squared
                 context = basepath context
                 op.each { |name| op.add_option('set', "#{name}.context=#{context}", escape: false) }
               end
-              op.append(escape: true, strip: /^:/, clear: true)
+              op.append(escape: true, strip: ':', clear: true)
             end
           end
           op.clear(pass: false)
@@ -471,7 +506,7 @@ module Squared
               end
               if multiple
                 op.concat(service) if service
-                op.append(delim: true, escape: true, strip: /^:/)
+                op.append(delim: true, escape: true, strip: ':')
               else
                 raise ArgumentError, message('no service was selected', hint: flag) unless service
 
@@ -536,10 +571,10 @@ module Squared
               end
             end
             append_command(flag, id || tagmain, op.extras)
-          when :update
+          when :update, :inspect
             raise ArgumentError, message('missing container', hint: flag) if op.empty?
 
-            op.append(escape: true, strip: /^:/)
+            op.append(escape: true, strip: ':')
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
@@ -569,14 +604,26 @@ module Squared
               end
               return
             end
-            op.append(escape: true, strip: /^:/)
+            case flag
+            when :logs, :diff, :attach, :top
+              op.add_first(escape: true, strip: ':')
+              if flag == :top
+                op.append(delim: true)
+              else
+                op.clear
+              end
+            else
+              op.append(escape: true, strip: ':')
+            end
           end
           run(from: from)
         end
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self, strict: strict?)
+          list = OPT_DOCKER[:image].fetch(flag, [])
+          list += OPT_DOCKER[:image][:common] unless flag == :ls || flag == :tag
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?)
           exception = exception?
           banner = true
           from = symjoin 'image', flag
@@ -654,6 +701,15 @@ module Squared
             sync = false
             exception ||= true
             banner = false
+          when :inspect, :history
+            raise ArgumentError, message('missing image', hint: flag) if op.empty?
+
+            if flag == :history
+              op.add_first(escape: true, strip: ':')
+                .clear
+            else
+              op.append(escape: true, strip: ':')
+            end
           end
           success?(run(sync: sync, exception: exception, banner: banner, from: from), flag == :tag || flag == :save)
         end
@@ -725,6 +781,7 @@ module Squared
         end
 
         def docker_session(*cmd, opts: nil)
+          opts = OptionPartition.union(Array(opts), @client) if @client
           return session('docker', *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_DOCKER[:common], project: self, strict: strict?)