moby-derp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4872cf7a3115e157c1cd297c180db60444a7b46064e6192564ba9d89f3477d9
-  data.tar.gz: 216b70b7af5e4a9e695dfcb3a668bc1fa3483ebed98ed010783977db4e20972b
+  metadata.gz: bdc70ac81fc8576afb34eaca6fe1faa74beeada5c176647e178f9c73cc02d96d
+  data.tar.gz: 369be36ae46d2ec386fe067dfa185ca3bf2526afafbb5ff6b547821f27ee1dc6
 SHA512:
-  metadata.gz: dd9a21877adc23193d59050030abd4257d83a3de86ba5c8e722ea5fd772583f142ac4a9cc381c8c1acbc93152506dceb3fa3f63889c9fcd0a9b9d3c08dc38718
-  data.tar.gz: 45cc46def1400c188fbf12b2d5ab0ff3e584d16ee3d9c83875dfd231b5f10bfe30813ce015533aa19a68aae479421208e470a5b98713bc1a1832692c96426741
+  metadata.gz: 1019db159382b95296300d4c2cecf9dadb808c796a3c5bb44d5eb2596361e962a6613cdd454865f86579a2575712ffeeb8eac55957aa8aca293c29da035dd3f5
+  data.tar.gz: af0a5315ea9320da3964e8ce7e76c6515529aea6fddba6a786c21002af434fc6aff84adcdda0cf556a23e826b42b5073c15b4ab6ed63d361dba3d57f90d0bc07

data/README.md

@@ -107,6 +107,23 @@ The keys are:
   mapped by a pod, and only the pod named in the mapping can publish on the
   specified port.
 
+* **`network_name`**: specify a network name to attach all pods to, if you
+  don't like Moby's default `bridge` network.
+
+* **`use_host_resolv_conf`**: Moby has some... strange ideas about what
+  constitutes DNS records (like thinking that PTR records can only be for
+  rDNS).  At the same time, you cannot, by purely Moby-sanctioned means,
+  disable the spectacularly broken DNS proxy that is inflicted on you if you
+  decide to use a custom network.  The only feasible workaround that I have
+  discovered is to straight-up bind mount the host's `/etc/resolv.conf` into
+  every single container.  If you, too, like your DNS resolution to work
+  properly when you use a non-default network, set this option to true.
+
+  Bear in mind, when constructing your host's `/etc/resolv.conf` file, that the
+  host's conception of "localhost" is different to each container's
+  "localhost"; so pointing to your local caching resolver using `127.0.0.1`
+  will not end in happiness and puppies.
+
 If you wish to modify the location of the `moby-derp` system-wide configuration
 file, you can do so by setting the `MOBY_DERP_SYSTEM_CONFIG_FILE` environment
 variable.  Note, however, that it is a terrible idea to let ordinary users control

data/lib/moby_derp/mount.rb

@@ -23,7 +23,7 @@ module MobyDerp
 				      "path traversal detected -- nice try, buddy"
 			end
 
-			if @source =~ %r{^(/|~)}
+			if @source =~ %r{^(/|~)} && @source != "/etc/resolv.conf"
 				raise ConfigurationError,
 				      "mount sources can only be relative paths"
 			end

data/lib/moby_derp/pod_config.rb

@@ -55,6 +55,15 @@ module MobyDerp
 			@common_mounts = @config.fetch("common_mounts", [])
 			@expose        = @config.fetch("expose", [])
 			@publish       = @config.fetch("publish", [])
+
+			if @system_config.use_host_resolv_conf
+				@common_mounts << {
+					"source"   => "/etc/resolv.conf",
+					"target"   => "/etc/resolv.conf",
+					"readonly" => true
+				}
+			end
+
 			validate_common_mounts
 			validate_expose
 			validate_publish

data/lib/moby_derp/system_config.rb

@@ -4,16 +4,18 @@ require "safe_yaml"
 
 module MobyDerp
 	class SystemConfig < ConfigFile
-		attr_reader :mount_root, :port_whitelist, :network_name, :cpu_count, :cpu_bits
+		attr_reader :mount_root, :port_whitelist, :network_name, :use_host_resolv_conf,
+		            :cpu_count, :cpu_bits
 
 		def initialize(filename, moby_info, logger)
 			@logger = logger
 
 			super(filename)
 
-			@mount_root     = @config["mount_root"]
-			@port_whitelist = stringify_keys(@config["port_whitelist"] || {})
-			@network_name   = @config["network_name"] || "bridge"
+			@mount_root           = @config["mount_root"]
+			@port_whitelist       = stringify_keys(@config["port_whitelist"] || {})
+			@network_name         = @config["network_name"] || "bridge"
+			@use_host_resolv_conf = @config["use_host_resolv_conf"] || false
 
 			@cpu_count = moby_info["NCPU"]
 			# As far as I can tell, the only 32-bit platform Moby supports is
@@ -35,6 +37,11 @@ module MobyDerp
 				      "network_name must be a string"
 			end
 
+			unless [true, false].include?(@use_host_resolv_conf)
+				raise ConfigurationError,
+				      "use_host_resolv_conf must be true or false"
+			end
+
 			unless File.directory?(@mount_root)
 				raise ConfigurationError,
 				      "mount_root #{@mount_root} must exist and be a directory"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moby-derp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api