kaiser 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cafb072893ff43f02aff0365dbb849f49800bf32ab65ce962b39745f97478dcd
-  data.tar.gz: 5f5e0be3d1f24ae1dc1b2ec9a7a2e50bda7fb748bda204c13856c3689883b003
+  metadata.gz: 0bcd84dd0ed4442ed01eb780b5d0a00ce5ae65117177f787e454cd4304b462cd
+  data.tar.gz: d9546e19dc9ee353c0755359e8946c213ebbbeb80c9b24f8cc86cd4d1c44356e
 SHA512:
-  metadata.gz: a123dc4b78a3d8859a88d52a5a3b2f34019949d30b2aa2f70c2a43e3938b278a55707b1b2e576092e857a196d46063c40f3d37bb5d26b7e51c571ed30e13c4e4
-  data.tar.gz: 020c7bbb44d0ce3878ca3c91a31afebe92736e4a511637291c3cafa2847865ebd4037567837aad9721963ac07838d36fcc2c23cea3a763438f510dea9aac7f99
+  metadata.gz: 3f2d2fdb0955599538acc55b61e079f87abb1c212f0fbdcdbfe57e6ba49def3ad56c2c60ae0b3edf984909952811c08004509dac4c8f96ad0cfd52ffb5a98bac
+  data.tar.gz: c2bef8823ee36a2636c0ed53a411806f1cd5c2ab190881fc8a8df8bbdbede9c00b43b505b5012373d6cb2402ecbecd2aed7b8df1cf8f1d9142a9dddd276cbeed

data/lib/kaiser/cli.rb

@@ -252,7 +252,7 @@ module Kaiser
       attach_mounts = Config.kaiserfile.attach_mounts
       volumes = attach_mounts.map { |from, to| "-v #{`pwd`.chomp}/#{from}:#{to}" }.join(' ')
 
-      system "docker run -ti
+      cmd = "docker run -ti
         --name #{app_container_name}
         --network #{network_name}
         --dns #{ip_of_container(Config.config[:shared_names][:dns])}
@@ -265,6 +265,9 @@ module Kaiser
         #{app_params}
         kaiser:#{envname}-#{current_branch} #{cmd}".tr("\n", ' ')
 
+      puts cmd
+      system cmd
+
       stop_services
 
       Config.out.puts 'Cleaning up...'
@@ -555,15 +558,6 @@ module Kaiser
           --network #{Config.config[:networkname]}
           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_node_image}"
-      )
       run_if_dead(
         Config.config[:shared_names][:nginx],
         "docker run -d
@@ -576,16 +570,35 @@ module Kaiser
           --network #{Config.config[:networkname]}
           jwilder/nginx-proxy"
       )
+
+      dnsconffile = "#{ENV['HOME']}/.kaiser/dnsconf"
+      File.write(dnsconffile, <<~HOSTS)
+        log-queries
+        no-resolv
+        server=8.8.8.8
+        server=1.1.1.1
+        address=/.#{http_suffix}/#{ip_of_container(Config.config[:shared_names][:nginx])}
+      HOSTS
+
       run_if_dead(
         Config.config[:shared_names][:dns],
         "docker run -d
           --name #{Config.config[:shared_names][:dns]}
           --network #{Config.config[:networkname]}
-          --privileged
-          -v /var/run/docker.sock:/docker.sock:ro
-          phensley/docker-dns
-          --domain #{http_suffix}
-          --record :#{ip_of_container(Config.config[:shared_names][:nginx])}"
+          -v #{dnsconffile}:/etc/dnsmasq.conf:ro
+          degica/dnsmasq
+        "
+      )
+
+      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]}
+          --dns #{ip_of_container(Config.config[:shared_names][:dns])}
+          #{selenium_node_image}"
       )
     end
 

data/lib/kaiser/version.rb

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

metadata

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