sillelien · janeczku · Sep 8, 2015
diff --git a/Dockerfile b/Dockerfile
@@ -3,12 +3,10 @@ MAINTAINER hello@neilellis.me
 
 COPY rootfs /
 ADD https://github.com/just-containers/s6-overlay/releases/download/v1.13.0.0/s6-overlay-amd64.tar.gz /tmp/s6-overlay.tar.gz
-
-# about nsswitch.conf - see https://registry.hub.docker.com/u/frolvlad/alpine-oraclejdk8/dockerfile/
+ADD https://github.com/janeczku/go-dnsmasq/releases/download/0.9.2/go-dnsmasq-min_linux-amd64 /usr/sbin/go-dnsmasq
 
 RUN tar xvfz /tmp/s6-overlay.tar.gz -C / && \
-  apk -U add dnsmasq jq curl && \
-  chmod 755 /bin/*.sh /etc/services.d/dns/run /etc/services.d/dns-hack/run /etc/services.d/syslog/run && \
+  chmod 755 /usr/sbin/go-dnsmasq /etc/services.d/dns/run /etc/services.d/syslog/run && \
   mkdir /app && \
   echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \
   addgroup -g 999 app && \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,13 @@
 main:
   build: .
-  command: ash -c "ping -c 1 test1 && ping -c 1 test2 && touch /docker-test/test.txt ; sleep 60"
+  command: ash -c "sleep 10 && ping -c 1 test1 && ping -c 1 test2 && cat /etc/resolv.conf > /docker-test/test.txt; sleep 10"
   volumes:
     - ./docker-test:/docker-test:rw
   links:
     - test1
     - test2
+  environment:
+    - DNSMASQ_ARGS=--verbose
 
 test1:
   image: nginx

diff --git a/rootfs/bin/additional_hosts.sh b/rootfs/bin/additional_hosts.sh
diff --git a/rootfs/bin/dns_hack.sh b/rootfs/bin/dns_hack.sh
diff --git a/rootfs/bin/get_hosts_from_tutum.sh b/rootfs/bin/get_hosts_from_tutum.sh
diff --git a/rootfs/bin/non_tutum_dns_hack.sh b/rootfs/bin/non_tutum_dns_hack.sh
diff --git a/rootfs/bin/tutum_dns_hack.sh b/rootfs/bin/tutum_dns_hack.sh
diff --git a/rootfs/etc/cont-init.d/dns_init.sh b/rootfs/etc/cont-init.d/dns_init.sh