Merge pull request #35 from bibendi/edge

Run dnsdock on random ip and assign DIP_DNS env variable
bibendi · Apr 11, 2018 · 567679a · 567679a
2 parents 36a4682 + 81a7a6a
commit 567679a
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -169,6 +169,7 @@ services:
     networks:
       - default
       - frontend
+    dns: $DIP_DNS
 
 networks:
   frontend:
@@ -190,6 +191,7 @@ services:
     networks:
       - default
       - frontend
+    dns: $DIP_DNS
 
 networks:
   frontend:
@@ -204,3 +206,14 @@ networks:
   curl www.bar-app.docker/api/v1/quz
   curl www.bar-app.docker/api/v1/baz_service/qzz
 ```
+
+### dip dns
+
+Runs DNS server container based on https://github.com/aacebedo/dnsdock It used for container to container requests through nginx. An application's docker-compose.yml should define `dns` configuration with environment variable `$DIP_DNS` and connect to external network `frontend`. `$DIP_DNS` will be automatically assigned by dip.
+
+```sh
+  dip dns up
+
+  cd foo-project
+  dip compose exec foo-web curl http://www.bar-app.docker/api/v1/baz_service
+```
diff --git a/shard.yml b/shard.yml
@@ -1,5 +1,5 @@
 name: dip
-version: 1.1.0
+version: 2.0.0
 
 crystal: 0.23.1
 

diff --git a/spec/dip/commands/dns_spec.cr b/spec/dip/commands/dns_spec.cr
@@ -9,18 +9,20 @@ describe Dip::Cli::Commands::Dns do
                                                     --detach \
                                                     --volume /var/run/docker.sock:/var/run/docker.sock:ro \
                                                     --restart always \
-                                                    --publish 172.17.0.1:53:53/udp \
+                                                    --publish 53/udp \
+                                                    --net frontend \
                                                     --name=dnsdock aacebedo/dnsdock:latest-amd64")
         end
       end
 
       it "starts dns container with custom ip and socket" do
-        Dip::Cli::Commands::Dns.run(%w(up --ip 8.8.8.8 -s /var/tmp/tmp.sock)) do |cmd|
+        Dip::Cli::Commands::Dns.run(%w(up --publish 8.8.8.8:53:53/udp -s /var/tmp/tmp.sock)) do |cmd|
           cmd.out.gets_to_end.should contain("docker run \
                                                     --detach \
                                                     --volume /var/tmp/tmp.sock:/var/run/docker.sock:ro \
                                                     --restart always \
                                                     --publish 8.8.8.8:53:53/udp \
+                                                    --net frontend \
                                                     --name=dnsdock aacebedo/dnsdock:latest-amd64")
         end
       end
@@ -36,5 +38,17 @@ describe Dip::Cli::Commands::Dns do
         end
       end
     end
+
+    describe "#ip" do
+      it "get running ip of dns container" do
+        Dip::Cli::Commands::Dns.run(%w(ip)) do |cmd|
+          output = cmd.out.gets_to_end
+
+          output.should contain("docker inspect" \
+                                " --format '{{ .NetworkSettings.Networks.frontend.IPAddress }}'" \
+                                " dnsdock 2>/dev/null")
+        end
+      end
+    end
   end
 end
diff --git a/spec/dip/commands/nginx_spec.cr b/spec/dip/commands/nginx_spec.cr
@@ -12,9 +12,11 @@ describe Dip::Cli::Commands::Nginx do
                                    --detach \
                                    --volume /var/run/docker.sock:/tmp/docker.sock:ro \
                                    --restart always \
-                                   --publish 0.0.0.0:80:80 \
+                                   --publish 80:80 \
                                    --net frontend \
-                                   --name=nginx abakpress/nginx-proxy:latest")
+                                   --name=nginx \
+                                   --label com.dnsdock.alias=docker \
+                                   abakpress/nginx-proxy:latest")
         end
       end
     end

diff --git a/src/dip/commands/dns.cr b/src/dip/commands/dns.cr
@@ -4,6 +4,7 @@ module Dip::Cli::Commands
   class Dns < ::Cli::Supercommand
     command "up"
     command "down"
+    command "ip"
 
     class Options
       help
@@ -17,7 +18,8 @@ module Dip::Cli::Commands
       class Up < ::Dip::Command
         class Options
           string %w(-s --socket), var: "PATH", default: "/var/run/docker.sock"
-          string %w(--ip), var: "IP", default: "172.17.0.1"
+          string %w(--net), var: "NET", default: "frontend"
+          string %w(--publish), var: "PUBLISH", default: "53/udp"
           string %w(--name), var: "NAME", default: "dnsdock"
           string %w(--image), var: "IMAGE", default: "aacebedo/dnsdock:latest-amd64"
           string %w(--domain), var: "DOMAIN", default: "docker"
@@ -33,7 +35,8 @@ module Dip::Cli::Commands
           result << "--detach"
           result << "--volume #{options.socket}:/var/run/docker.sock:ro"
           result << "--restart always"
-          result << "--publish #{options.ip}:53:53/udp"
+          result << "--publish #{options.publish}"
+          result << "--net #{options.net}"
           result << "--name=#{options.name}"
           result.join(' ')
         end
@@ -50,6 +53,20 @@ module Dip::Cli::Commands
           exec_cmd("docker rm -v #{options.name}")
         end
       end
+
+      class Ip < ::Dip::Command
+        class Options
+          string %w(--name), var: "NAME", default: "dnsdock"
+          string %w(--net), var: "NET", default: "frontend"
+          help
+        end
+
+        def run
+          exec_cmd("docker inspect" \
+                   " --format '{{ .NetworkSettings.Networks.#{options.net}.IPAddress }}'" \
+                   " #{options.name} 2>/dev/null")
+        end
+      end
     end
   end
 end
diff --git a/src/dip/commands/nginx.cr b/src/dip/commands/nginx.cr
@@ -18,10 +18,10 @@ module Dip::Cli::Commands
         class Options
           string %w(-s --socket), var: "PATH", default: "/var/run/docker.sock"
           string %w(--net), var: "NET", default: "frontend"
-          string %w(--ip), var: "IP", default: "0.0.0.0"
-          string %w(-p --port), var: "PORT", default: "80"
+          string %w(--publish), var: "PUBLISH", default: "80:80"
           string %w(--name), var: "NAME", default: "nginx"
           string %w(--image), var: "IMAGE", default: "abakpress/nginx-proxy:latest"
+          string %w(--domain), var: "DOMAIN", default: "docker"
           help
         end
 
@@ -35,9 +35,10 @@ module Dip::Cli::Commands
           result << "--detach"
           result << "--volume #{options.socket}:/tmp/docker.sock:ro"
           result << "--restart always"
-          result << "--publish #{options.ip}:#{options.port}:80"
+          result << "--publish #{options.publish}"
           result << "--net #{options.net}"
           result << "--name=#{options.name}"
+          result << "--label com.dnsdock.alias=#{options.domain}"
           result.join(' ')
         end
       end

diff --git a/src/dip/environment.cr b/src/dip/environment.cr
@@ -8,6 +8,10 @@ module Dip
       default_vars.each do |key, value|
         @vars[key] = ENV.fetch(key) { replace(value) }
       end
+
+      unless Dip.test?
+        @vars["DIP_DNS"] = ENV.fetch("DIP_DNS") { find_dns }
+      end
     end
 
     def merge!(new_vars : Hash(String, String))
@@ -26,5 +30,20 @@ module Dip
 
       result
     end
+
+    private def find_dns
+      dns_net = ENV.fetch("FRONTEND_NETWORK") { "frontend" }
+      dns_name = ENV.fetch("DNSDOCK_CONTAINER") { "dnsdock" }
+      cmd = "docker inspect" \
+            " --format '{{ .NetworkSettings.Networks.#{dns_net}.IPAddress }}'" \
+            " #{dns_name} 2>/dev/null"
+      ip = `#{cmd}`.strip
+
+      if ip.empty?
+        "8.8.8.8"
+      else
+        ip
+      end
+    end
   end
 end
diff --git a/src/dip/version.cr b/src/dip/version.cr
@@ -1,3 +1,3 @@
 module Dip
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end