kaiser 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dbf71eb7bad9c114db9ccc5d967d2cfa3e16ed6c7b4966ff435ad3d5bf4f150
-  data.tar.gz: 0a259055ac34524ca7628924bd27f30c2f88dbfbdcae4000331770e072b25333
+  metadata.gz: 0bcd84dd0ed4442ed01eb780b5d0a00ce5ae65117177f787e454cd4304b462cd
+  data.tar.gz: d9546e19dc9ee353c0755359e8946c213ebbbeb80c9b24f8cc86cd4d1c44356e
 SHA512:
-  metadata.gz: 662ab6713b4eb2fd0b13c6a30959bef98a26eb704bee59efb9586fbe96f0dffa62c7b4c1ba64085eb127d2c24aac52f06438efef27838021951251191ed44d3d
-  data.tar.gz: f2e908d931510eb378fdf4a1749f8bb2b7c400ed765b1b9ef5f472222d5ba402a291dcc5672aae308b982341cc2059a9be1b720793d84cc407bce8d4dcef91b9
+  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,17 +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
-          -e DOCKER_HOST='unix:///var/run/docker.sock'
-          -v /var/run/docker.sock:/var/run/docker.sock:ro
-          davidsiaw/dockerdns
-          --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.2'
+  VERSION = '0.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaiser
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  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