Merge branch 'main' into add-support-for-volumes

lib/mrsk/commands/app.rb

@@ -60,6 +60,14 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       *command
   end
 
+  def follow_logs(host:, grep: nil)
+    run_over_ssh pipe(
+      current_container_id,
+      "xargs docker logs -t -n 10 -f 2>&1",
+      ("grep '#{grep}'" if grep)
+    ).join(" "), host: host
+  end
+
   def console(host:)
     exec_over_ssh "bin/rails", "c", host: host
   end
@@ -82,7 +90,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
 
   private
     def exec_over_ssh(*command, host:)
-      "ssh -t #{config.ssh_user}@#{host} '#{run_exec(*command, interactive: true).join(" ")}'"
+      run_over_ssh run_exec(*command, interactive: true).join(" "), host: host
     end
 
     def service_filter

lib/mrsk/commands/base.rb

@@ -23,5 +23,9 @@ module Mrsk::Commands
       def docker(*args)
         args.compact.unshift :docker
       end
+
+      def run_over_ssh(command, host:)
+        "ssh -t #{config.ssh_user}@#{host} '#{command}'"
+      end
   end
 end

lib/mrsk/commands/builder.rb

@@ -2,10 +2,9 @@ require "mrsk/commands/base"
 
 class Mrsk::Commands::Builder < Mrsk::Commands::Base
   delegate :create, :remove, :push, :pull, :info, to: :target
-  delegate :native?, :multiarch?, :remote?, to: :name
 
   def name
-    target.class.to_s.demodulize.downcase.inquiry
+    target.class.to_s.remove("Mrsk::Commands::Builder::").underscore
   end
 
   def target
@@ -14,6 +13,8 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base
       native
     when config.builder && config.builder["local"] && config.builder["remote"]
       multiarch_remote
+    when config.builder && config.builder["remote"]
+      native_remote
     else
       multiarch
     end
@@ -23,6 +24,10 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base
     @native ||= Mrsk::Commands::Builder::Native.new(config)
   end
 
+  def native_remote
+    @native ||= Mrsk::Commands::Builder::Native::Remote.new(config)
+  end
+
   def multiarch
     @multiarch ||= Mrsk::Commands::Builder::Multiarch.new(config)
   end
@@ -33,5 +38,6 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base
 end
 
 require "mrsk/commands/builder/native"
+require "mrsk/commands/builder/native/remote"
 require "mrsk/commands/builder/multiarch"
 require "mrsk/commands/builder/multiarch/remote"

lib/mrsk/commands/builder/base.rb

@@ -17,10 +17,10 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
 
   private
     def args
-      config.builder["args"] || {}
+      (config.builder && config.builder["args"]) || {}
     end
 
     def secrets
-      config.builder["secrets"] || []
+      (config.builder && config.builder["secrets"]) || []
     end
 end

lib/mrsk/commands/builder/multiarch.rb

@@ -12,7 +12,8 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
   def push
     docker :buildx, :build,
       "--push",
-      "--platform linux/amd64,linux/arm64",
+      "--platform", "linux/amd64,linux/arm64",
+      "--builder", builder_name,
       "-t", config.absolute_image,
       *build_args,
       *build_secrets,
@@ -27,6 +28,6 @@ class Mrsk::Commands::Builder::Multiarch < Mrsk::Commands::Builder::Base
 
   private
     def builder_name
-      "mrsk-#{config.service}"
+      "mrsk-#{config.service}-multiarch"
     end
 end

lib/mrsk/commands/builder/multiarch/remote.rb

@@ -15,8 +15,16 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
   end
 
   private
+    def builder_name
+      super + "-remote"
+    end
+
+    def builder_name_with_arch(arch)
+      "#{builder_name}-#{arch}"
+    end
+
     def create_local_buildx
-      docker :buildx, :create, "--use", "--name", builder_name, builder_name_with_arch(local["arch"]), "--platform", "linux/#{local["arch"]}"
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local["arch"]), "--platform", "linux/#{local["arch"]}"
     end
 
     def append_remote_buildx
@@ -50,9 +58,4 @@ class Mrsk::Commands::Builder::Multiarch::Remote < Mrsk::Commands::Builder::Mult
     def remote
       config.builder["remote"]
     end
-
-    private
-      def builder_name_with_arch(arch)
-        "#{builder_name}-#{arch}"
-      end
 end

lib/mrsk/commands/builder/native/remote.rb

@@ -0,0 +1,71 @@
+require "mrsk/commands/builder/native"
+
+class Mrsk::Commands::Builder::Native::Remote < Mrsk::Commands::Builder::Native
+  def create
+    combine \
+      create_context,
+      create_buildx
+  end
+
+  def remove
+    combine \
+      remove_context,
+      remove_buildx
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      "--platform", platform,
+      "--builder", builder_name,
+      "-t", config.absolute_image,
+      *build_args,
+      *build_secrets,
+      "."
+  end
+
+  def info
+    combine \
+      docker(:context, :ls),
+      docker(:buildx, :ls)
+  end
+
+
+  private
+    def arch
+      config.builder["remote"]["arch"]
+    end
+
+    def host
+      config.builder["remote"]["host"]
+    end
+
+    def builder_name
+      "mrsk-#{config.service}-native-remote"
+    end
+
+    def builder_name_with_arch
+      "#{builder_name}-#{arch}"
+    end
+
+    def platform
+      "linux/#{arch}"
+    end
+
+    def create_context
+      docker :context, :create,
+        builder_name_with_arch, "--description", "'#{builder_name} #{arch} native host'", "--docker", "'host=#{host}'"
+    end
+
+    def remove_context
+      docker :context, :rm, builder_name_with_arch
+    end
+
+    def create_buildx
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch, "--platform", platform
+    end
+
+    def remove_buildx
+      docker :buildx, :rm, builder_name
+    end
+end

lib/mrsk/commands/traefik.rb

@@ -8,7 +8,8 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
       "-p 80:80",
       "-v /var/run/docker.sock:/var/run/docker.sock",
       "traefik",
-      "--providers.docker"
+      "--providers.docker",
+      "--log.level=DEBUG"
   end
 
   def start
@@ -23,8 +24,17 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
     docker :ps, "--filter", "name=traefik"
   end
 
-  def logs
-    docker :logs, "traefik", "-n", "100", "-t"
+  def logs(since: nil, lines: nil, grep: nil)
+    pipe \
+      docker(:logs, "traefik", (" --since #{since}" if since), (" -n #{lines}" if lines), "-t", "2>&1"),
+      ("grep '#{grep}'" if grep)
+  end
+
+  def follow_logs(host:, grep: nil)
+    run_over_ssh pipe(
+      docker(:logs, "traefik", "-t", "-n", "10", "-f", "2>&1"),
+      ("grep '#{grep}'" if grep)
+    ).join(" "), host: host
   end
 
   def remove_container