From fd5172266e9197ea08e86be1dbd8d64034cb0a14 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 13 Jan 2023 10:28:46 +0100 Subject: [PATCH] More expansive info on builder --- lib/mrsk/commands/builder.rb | 2 +- lib/mrsk/commands/builder/multiarch.rb | 6 ++++++ lib/mrsk/commands/builder/native.rb | 4 ++++ lib/tasks/mrsk/build.rake | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/mrsk/commands/builder.rb b/lib/mrsk/commands/builder.rb index d2b9cf1f..04299a1c 100644 --- a/lib/mrsk/commands/builder.rb +++ b/lib/mrsk/commands/builder.rb @@ -1,7 +1,7 @@ require "mrsk/commands/base" class Mrsk::Commands::Builder < Mrsk::Commands::Base - delegate :create, :remove, :push, :pull, to: :target + delegate :create, :remove, :push, :pull, :info, to: :target delegate :native?, :multiarch?, :remote?, to: :name def name diff --git a/lib/mrsk/commands/builder/multiarch.rb b/lib/mrsk/commands/builder/multiarch.rb index 8639e1c6..ca9d7719 100644 --- a/lib/mrsk/commands/builder/multiarch.rb +++ b/lib/mrsk/commands/builder/multiarch.rb @@ -16,4 +16,10 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Base def pull docker :pull, config.absolute_image end + + def info + combine \ + docker(:context, :ls), + docker(:buildx, :ls) + end end diff --git a/lib/mrsk/commands/builder/native.rb b/lib/mrsk/commands/builder/native.rb index 56b71517..6de05381 100644 --- a/lib/mrsk/commands/builder/native.rb +++ b/lib/mrsk/commands/builder/native.rb @@ -18,4 +18,8 @@ class Mrsk::Commands::Builder::Native < Mrsk::Commands::Base def pull docker :pull, config.absolute_image end + + def info + # No-op on native + end end diff --git a/lib/tasks/mrsk/build.rake b/lib/tasks/mrsk/build.rake index ced548ec..b0bd3b4a 100644 --- a/lib/tasks/mrsk/build.rake +++ b/lib/tasks/mrsk/build.rake @@ -45,6 +45,7 @@ namespace :mrsk do task :info do run_locally do puts "Builder: #{MRSK.builder.name} (#{MRSK.builder.target.class.name})" + puts capture(*MRSK.builder.info) end end end