kaiser 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d4fd9b85447651ce719c71e51f6bfd1af581013b1fb8a2bf1e1e4bfa2c8ccfc
-  data.tar.gz: 39a81b95b162e03fea07c40899883a655788d60c1e6bd0c2a21f738c8c05d53e
+  metadata.gz: 92b3034ab17814ed926d2b9168806132dc548783becdd3b9037b2fefa55b1c9d
+  data.tar.gz: 001e9c5e10b094b349d0a65527da079d483219081e7e8a6e0f2ae0731a2b1d96
 SHA512:
-  metadata.gz: 297aece4ef6c978814aeb2daa9a70b3847b90e16671a59fe8490a6ddc9eb00f805ab9751a638b169bdf0854a1a7e9f3bd5d918a13a98bf336bd1ffb41622e6e2
-  data.tar.gz: 62e72ad3b021256950a52ce9f38f2f5a47eb57050c16361e08a3eaa210f8f15e7c2282af595935d461c4dc7e9219cfc1331c1432ede1ece997251006be8c9a17
+  metadata.gz: e4e79a8b16f93a34587106cf800d098bbd88a0f26e3a0725fefc01232e2d135a8010c7f728629bf378702070a95c11a437ec7a4486f7c1e881ffc029158a7a61
+  data.tar.gz: 5d4bf821446f25df5f3d6dbb1a30ba0682bcdc7620b60b9acc03c19afd95f919f99da242b6afa873087928d5c7a45522c400125b0407696485e9bcbe6fcaf7c9

data/README.md

@@ -31,6 +31,7 @@ Simply clone the repo and run
 
 ```
 cd kaiser
+bundle
 docker build -t degica/kaiser . 
 ```
 
@@ -48,6 +49,12 @@ function kaiser
 end
 ```
 
+Confirm it is working by running
+
+```
+kaiser -h
+```
+
 ## Usage
 
 You'll need a Dockerfile and a Kaiserfile. The Kaiserfile should be placed in the project root directory, with contents like this:

data/lib/kaiser/cli.rb

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
 require 'kaiser/command_runner'
+require 'active_support/core_ext/object/blank'
 
 module Kaiser
   # The commandline
   class Cli
     extend Kaiser::CliOptions
 
+    attr_reader :use_kaiserfile
+
+    def initialize
+      @use_kaiserfile = true
+    end
+
     def set_config
       # This is here for backwards compatibility since it can be used in Kaiserfiles.
       # It would be a good idea to deprecate this and make it more abstract.
@@ -18,7 +25,7 @@ module Kaiser
       @out = Config.out
       @info_out = Config.info_out
 
-      @kaiserfile.validate!
+      @kaiserfile.validate! if @use_kaiserfile
     end
 
     # At first I did this in the constructor but the problem with that is Optimist
@@ -36,7 +43,7 @@ module Kaiser
       Optimist.options do
         banner u
 
-        global_opts.each { |o| opt *o }
+        global_opts.each { |o| opt(*o) }
       end
     end
 
@@ -55,12 +62,12 @@ module Kaiser
       # easily use ARGV.shift to access its own subcommands.
       ARGV.shift
 
-      Kaiser::Config.load(Dir.pwd)
+      Kaiser::Config.load(Dir.pwd, use_kaiserfile: cmd.use_kaiserfile)
 
       # We do all this work in here instead of the exe/kaiser file because we
       # want -h options to output before we check if a Kaiserfile exists.
       # If we do it in exe/kaiser, people won't be able to check help messages
-      # unless they create a Kaiserfile firest.
+      # unless they create a Kaiserfile first.
       if opts[:quiet]
         Config.out = File.open(File::NULL, 'w')
         Config.info_out = File.open(File::NULL, 'w')
@@ -389,6 +396,10 @@ module Kaiser
       @services ||= Config.kaiserfile.services.map { |name, info| Service.new(envname, name, info) }
     end
 
+    def force_platform
+      Config.kaiserfile.platform || ''
+    end
+
     def db_port
       Config.config[:envs][envname][:db_port]
     end
@@ -513,6 +524,19 @@ module Kaiser
       end
     end
 
+    def selenium_node_image
+      return ENV['OVERRIDE_SELENIUM_NODE_IMAGE'] unless ENV['OVERRIDE_SELENIUM_NODE_IMAGE'].nil?
+
+      if RUBY_PLATFORM.start_with?('arm64') || RUBY_PLATFORM.start_with?('aarch64')
+        # use the seleniarm image because its more stable in arm procs
+        # somehow the x64 image does not do well under qemu under arm
+        return 'seleniarm/standalone-chromium'
+      end
+
+      # default to x64 image
+      'selenium/standalone-chrome-debug'
+    end
+
     def ensure_setup
       ensure_env
 
@@ -527,15 +551,16 @@ module Kaiser
         "docker run -d
           --name #{Config.config[:shared_names][:redis]}
           --network #{Config.config[:networkname]}
-          redis:alpine"
+          redis:7-alpine"
       )
       run_if_dead(
         Config.config[:shared_names][:chrome],
         "docker run -d
           -p 5900:5900
+          --shm-size='2g'
           --name #{Config.config[:shared_names][:chrome]}
           --network #{Config.config[:networkname]}
-          selenium/standalone-chrome-debug"
+          #{selenium_node_image}"
       )
       run_if_dead(
         Config.config[:shared_names][:nginx],
@@ -573,7 +598,7 @@ module Kaiser
 
     def container_dead?(container)
       x = JSON.parse(`docker inspect #{container} 2>/dev/null`)
-      return true if x.length.zero? || x[0]['State']['Running'] == false
+      x.empty? || x[0]['State']['Running'] == false
     end
 
     def if_container_dead(container)
@@ -584,14 +609,14 @@ module Kaiser
 
     def create_if_volume_not_exist(vol)
       x = JSON.parse(`docker volume inspect #{vol} 2>/dev/null`)
-      return unless x.length.zero?
+      return unless x.empty?
 
       CommandRunner.run! Config.out, "docker volume create #{vol}"
     end
 
     def create_if_network_not_exist(net)
       x = JSON.parse(`docker inspect #{net} 2>/dev/null`)
-      return unless x.length.zero?
+      return unless x.empty?
 
       CommandRunner.run! Config.out, "docker network create #{net}"
     end
@@ -614,7 +639,7 @@ module Kaiser
 
     def killrm(container)
       x = JSON.parse(`docker inspect #{container} 2>/dev/null`)
-      return if x.length.zero?
+      return if x.empty?
 
       CommandRunner.run Config.out, "docker kill #{container}" if x[0]['State'] && x[0]['State']['Running'] == true
       CommandRunner.run Config.out, "docker rm #{container}" if x[0]['State']

data/lib/kaiser/cmds/set.rb

@@ -21,6 +21,11 @@ module Kaiser
         EOS
       end
 
+      def initialize
+        super
+        @use_kaiserfile = false
+      end
+
       def execute(_opts)
         cmd = ARGV.shift
 

data/lib/kaiser/cmds/shutdown.rb

@@ -14,7 +14,7 @@ module Kaiser
       end
 
       def execute(_opts)
-        Config.config[:shared_names].each do |_, container_name|
+        Config.config[:shared_names].each_value do |container_name|
           killrm container_name
         end
 

data/lib/kaiser/cmds/up.rb

@@ -28,14 +28,24 @@ module Kaiser
         end
       end
 
+      def build_cmd
+        platform_args = ''
+        platform_args = "--platform=#{force_platform}" unless force_platform.empty?
+        build_args = docker_build_args.map { |k, v| "--build-arg #{k}=#{v}" }
+        [
+          'docker build',
+          "-t kaiser:#{envname}-#{current_branch}",
+          "-f #{tmp_dockerfile_name} #{Config.work_dir}",
+          platform_args,
+          build_args.join(' ').to_s
+        ]
+      end
+
       def setup_app
         Config.info_out.puts 'Setting up application'
         File.write(tmp_dockerfile_name, docker_file_contents)
-        build_args = docker_build_args.map { |k, v| "--build-arg #{k}=#{v}" }
-        CommandRunner.run! Config.out, "docker build
-          -t kaiser:#{envname}-#{current_branch}
-          -f #{tmp_dockerfile_name} #{Config.work_dir}
-          #{build_args.join(' ')}"
+
+        CommandRunner.run! Config.out, build_cmd.join("\n\t")
         FileUtils.rm(tmp_dockerfile_name)
       end
     end

data/lib/kaiser/config.rb

@@ -12,7 +12,7 @@ module Kaiser
                   :kaiserfile,
                   :config
 
-      def load(work_dir)
+      def load(work_dir, use_kaiserfile: true)
         @work_dir = work_dir
         @config_dir = "#{ENV['HOME']}/.kaiser"
 
@@ -20,7 +20,6 @@ module Kaiser
 
         FileUtils.mkdir_p @config_dir
         @config_file = "#{@config_dir}/config.yml"
-        @kaiserfile = Kaiserfile.new("#{@work_dir}/Kaiserfile")
 
         @config = {
           envnames: {},
@@ -39,8 +38,11 @@ module Kaiser
 
         load_config
 
-        alt_kaiserfile = "#{ENV['HOME']}/kaiserfiles/Kaiserfile.#{@config[:envnames][work_dir]}"
-        @kaiserfile = Kaiserfile.new(alt_kaiserfile) if File.exist?(alt_kaiserfile)
+        if use_kaiserfile
+          @kaiserfile = Kaiserfile.new("#{@work_dir}/Kaiserfile")
+          alt_kaiserfile = "#{ENV['HOME']}/kaiserfiles/Kaiserfile.#{@config[:envnames][work_dir]}"
+          @kaiserfile = Kaiserfile.new(alt_kaiserfile) if File.exist?(alt_kaiserfile)
+        end
 
         @config
       end

data/lib/kaiser/kaiserfile.rb

@@ -76,6 +76,10 @@ module Kaiser
       }
     end
 
+    def force_platform(platform_name)
+      @platform = platform_name
+    end
+
     def expose(port)
       @port = port
     end

data/lib/kaiser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaiser
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Manage your monsters