From 9a37259bc4775f51402ba53984d19125799ae542 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Thu, 25 Dec 2014 18:50:18 +0800
Subject: [PATCH] update

---
 webkit/Dockerfile | 14 ++++++++------
 webkit/README.md  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webkit/Dockerfile b/webkit/Dockerfile
index 2f36082..82ea3ff 100644
--- a/webkit/Dockerfile
+++ b/webkit/Dockerfile
@@ -1,19 +1,21 @@
 #
-# Dockerfile for webkit
+# Dockerfile for webkit/phantomjs
 #
 
 FROM ubuntu:14.04
 MAINTAINER kev
 
 RUN apt-get update && apt-get install -y supervisor haproxy libfontconfig1 libfreetype6
-RUN mkdir -p /usr/local/lib/webkit/ /etc/supervisor/conf.d/ /etc/monit/ /var/lib/monit/events/
+RUN mkdir -p /webkit/includes/ /etc/supervisor/conf.d/ /etc/monit/conf.d/ /var/lib/monit/events/
 
-ADD ./*.js ./includes /usr/local/lib/webkit/
-ADD ./bin/* /usr/local/bin/
+ADD ./*.js /webkit/
+ADD ./includes/ /webkit/includes/
+ADD ./bin/ /usr/local/bin/
 ADD ./haproxy.cfg /etc/haproxy/
 ADD ./supervisor/supervisord.conf /etc/supervisor/
-ADD ./supervisor/conf.d/* /etc/supervisor/conf.d/
-ADD ./monit/ /etc/monit/
+ADD ./supervisor/conf.d/ /etc/supervisor/conf.d/
+ADD ./monit/monitrc /etc/monit/
+ADD ./monit/conf.d/ /etc/monit/conf.d/
 
 RUN chmod 600 /etc/monit/monitrc
 
diff --git a/webkit/README.md b/webkit/README.md
index 76b0b07..fac6851 100644
--- a/webkit/README.md
+++ b/webkit/README.md
@@ -1,4 +1,4 @@
-A simple web-service for rendering javascript-enabled website.
+A simple web-service based on PhantomJS for rendering javascript-enabled website.
 
 ## server