kaiser 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b3034ab17814ed926d2b9168806132dc548783becdd3b9037b2fefa55b1c9d
-  data.tar.gz: 001e9c5e10b094b349d0a65527da079d483219081e7e8a6e0f2ae0731a2b1d96
+  metadata.gz: cafb072893ff43f02aff0365dbb849f49800bf32ab65ce962b39745f97478dcd
+  data.tar.gz: 5f5e0be3d1f24ae1dc1b2ec9a7a2e50bda7fb748bda204c13856c3689883b003
 SHA512:
-  metadata.gz: e4e79a8b16f93a34587106cf800d098bbd88a0f26e3a0725fefc01232e2d135a8010c7f728629bf378702070a95c11a437ec7a4486f7c1e881ffc029158a7a61
-  data.tar.gz: 5d4bf821446f25df5f3d6dbb1a30ba0682bcdc7620b60b9acc03c19afd95f919f99da242b6afa873087928d5c7a45522c400125b0407696485e9bcbe6fcaf7c9
+  metadata.gz: a123dc4b78a3d8859a88d52a5a3b2f34019949d30b2aa2f70c2a43e3938b278a55707b1b2e576092e857a196d46063c40f3d37bb5d26b7e51c571ed30e13c4e4
+  data.tar.gz: 020c7bbb44d0ce3878ca3c91a31afebe92736e4a511637291c3cafa2847865ebd4037567837aad9721963ac07838d36fcc2c23cea3a763438f510dea9aac7f99

data/README.md

@@ -38,14 +38,14 @@ docker build -t degica/kaiser .
 And then add the following line to your `.bashrc` or `.bash_profile`
 
 ```
-alias kaiser='docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/.kaiser:/root/.kaiser -v `pwd`:`pwd` -e CONTEXT_DIR="`pwd`" degica/kaiser'
+alias kaiser='docker run --pull=always --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/.kaiser:/root/.kaiser -v `pwd`:`pwd` -e CONTEXT_DIR="`pwd`" degicadev/kaiser'
 ```
 
 Or if you use fish
 
 ```
 function kaiser
-  docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/.kaiser:/root/.kaiser -v (pwd):(pwd) -e CONTEXT_DIR=(pwd) degica/kaiser $argv
+  docker run --pull=always --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/.kaiser:/root/.kaiser -v (pwd):(pwd) -e CONTEXT_DIR=(pwd) degicadev/kaiser $argv
 end
 ```
 

data/exe/kaiser

@@ -5,7 +5,6 @@ require 'optimist'
 require 'fileutils'
 require 'yaml'
 require 'json'
-require 'pty'
 require 'erb'
 
 require 'kaiser'

data/lib/kaiser/cli.rb

@@ -110,11 +110,7 @@ module Kaiser
       services.each do |service|
         Config.info_out.puts "Starting service: #{service.name}"
         run_if_dead(
-          service.shared_name,
-          "docker run -d
-            --name #{service.shared_name}
-            --network #{Config.config[:networkname]}
-            #{service.image}"
+          service.shared_name, service.start_docker_command
         )
       end
     end
@@ -246,6 +242,10 @@ module Kaiser
     end
 
     def attach_app
+      start_services
+
+      puts 'Attaching to app...'
+
       cmd = (ARGV || []).join(' ')
       killrm app_container_name
 
@@ -265,6 +265,8 @@ module Kaiser
         #{app_params}
         kaiser:#{envname}-#{current_branch} #{cmd}".tr("\n", ' ')
 
+      stop_services
+
       Config.out.puts 'Cleaning up...'
     end
 
@@ -581,7 +583,7 @@ module Kaiser
           --network #{Config.config[:networkname]}
           --privileged
           -v /var/run/docker.sock:/docker.sock:ro
-          davidsiaw/docker-dns
+          phensley/docker-dns
           --domain #{http_suffix}
           --record :#{ip_of_container(Config.config[:shared_names][:nginx])}"
       )

data/lib/kaiser/cmds/up.rb

@@ -45,7 +45,10 @@ module Kaiser
         Config.info_out.puts 'Setting up application'
         File.write(tmp_dockerfile_name, docker_file_contents)
 
-        CommandRunner.run! Config.out, build_cmd.join("\n\t")
+        CommandRunner.run! Config.out, build_cmd.join("\n\t"), env_vars: {
+          'DOCKER_BUILDKIT' => '1',
+          'BUILDKIT_PROGRESS' => 'plain'
+        }
         FileUtils.rm(tmp_dockerfile_name)
       end
     end

data/lib/kaiser/command_runner.rb

@@ -1,24 +1,28 @@
 # frozen_string_literal: true
 
+require 'pty'
 require 'English'
 
-# This is the command runner
 module Kaiser
-  # Make running easy
+  # This is the command runner
+  # it abstracts away the complicated syntax required to deal with
+  # PTY and to pass the lines programmatically to the host application
+  # as well as to capture the return code at the end.
   class CommandRunner
-    def self.run(out, cmd, &block)
+    def self.run(out, cmd, env_vars: {}, &block)
       out.puts "> #{cmd}"
-      CommandRunner.new(out, cmd).run_command(&block)
+      CommandRunner.new(out, cmd, env_vars).run_command(&block)
     end
 
-    def self.run!(out, cmd, &block)
-      status = run(out, cmd, &block)
+    def self.run!(out, cmd, env_vars: {}, &block)
+      status = run(out, cmd, env_vars: env_vars, &block)
       raise Kaiser::CmdError.new(cmd, status) if status.to_s != '0'
     end
 
-    def initialize(out, cmd)
+    def initialize(out, cmd, env_vars)
       @out = out
       @cmd = cmd.tr "\n", ' '
+      @env_vars = env_vars
     end
 
     def print_and_return_status(status = 0)
@@ -38,7 +42,7 @@ module Kaiser
     end
 
     def run_command(&block)
-      PTY.spawn("#{@cmd} 2>&1") do |stdout, _stdin, pid|
+      PTY.spawn(@env_vars, "#{@cmd} 2>&1") do |stdout, _stdin, pid|
         print_lines(stdout, &block)
         Process.wait(pid)
       end

data/lib/kaiser/kaiserfile.rb

@@ -102,10 +102,20 @@ module Kaiser
       @server_type = value
     end
 
-    def service(name, image: name)
+    def service(name,
+                image: name,
+                command: nil,
+                binds: {},
+                env: {})
+
       raise "duplicate service #{name.inspect}" if @services.key?(name)
 
-      @services[name] = { image: image }
+      @services[name] = {
+        image: image,
+        command: command,
+        binds: binds,
+        env: env
+      }
     end
   end
 end

data/lib/kaiser/service.rb

@@ -18,5 +18,43 @@ module Kaiser
     def image
       @service_info[:image]
     end
+
+    def command
+      @service_info[:command].to_s
+    end
+
+    def binds
+      @service_info[:binds] || {}
+    end
+
+    def env
+      @service_info[:env] || {}
+    end
+
+    def start_docker_command
+      envstring = env.map do |k, v|
+        "-e #{k}=#{v}"
+      end.join(' ')
+
+      bindstring = binds.map do |k, v|
+        "-v #{k}:#{v}"
+      end.join(' ')
+
+      commandstring = command
+
+      cmd_array = [
+        'docker run -d',
+        "--name #{shared_name}",
+        "--network #{Config.config[:networkname]}",
+        envstring,
+        bindstring,
+        image,
+        commandstring
+      ]
+
+      cmd_array.filter! { |x| !x.empty? }
+
+      cmd_array.join(' ')
+    end
   end
 end

data/lib/kaiser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaiser
-  VERSION = '0.7.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaiser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport