Merge pull request #296 from TrueCar/toddw/dnsmasq

use dnsmasq

docker/Dockerfile

@@ -64,6 +64,13 @@ RUN apt-get update && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
+RUN apt-get update && apt-get install dnsmasq -y
+
+ADD docker/resolv.conf /etc/resolv.conf.new
+ADD docker/dnsmasq.conf /etc/dnsmasq.conf
+ADD docker/start /app/start
+RUN chmod +x /app/start
+
 EXPOSE 8888
 
-CMD ["gluestick", "start", "-P"]
+CMD ["/app/start"]

docker/dnsmasq.conf

@@ -0,0 +1,5 @@
+server=8.8.8.8
+server=8.8.4.4
+user=root
+listen-address=127.0.0.1
+

docker/resolv.conf

@@ -0,0 +1,2 @@
+search local
+nameserver 127.0.0.1

docker/start

@@ -0,0 +1,4 @@
+#!/bin/sh
+cat /etc/resolv.conf.new > /etc/resolv.conf
+service dnsmasq start
+exec gluestick start -P

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gluestick",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "GlueStick is a command line interface for quickly developing universal web applications using React",
   "main": "src/cli-harmony.js",
   "bin": "src/cli-harmony.js",

templates/new/src/config/.Dockerfile

@@ -2,7 +2,7 @@
 # This file is automatically generated. You can copy this file and add a
 # Dockerfile to the root of the project if you would like to use a custom
 # docker setup.
-FROM truecar/gluestick:0.9.19
+FROM truecar/gluestick:0.9.20
 
 ADD . /app