Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

Commit

Permalink
use dnsmasq
Browse files Browse the repository at this point in the history
  • Loading branch information
toddw committed Sep 17, 2016
1 parent 0468f06 commit d39e049
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 3 deletions.
9 changes: 8 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
5 changes: 5 additions & 0 deletions docker/dnsmasq.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
server=8.8.8.8
server=8.8.4.4
user=root
listen-address=127.0.0.1

2 changes: 2 additions & 0 deletions docker/resolv.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
search local
nameserver 127.0.0.1
4 changes: 4 additions & 0 deletions docker/start
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
cat /etc/resolv.conf.new > /etc/resolv.conf
service dnsmasq start
exec gluestick start -P
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion templates/new/src/config/.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d39e049

Please sign in to comment.