diff --git a/webkit/Dockerfile b/webkit/Dockerfile index 8f3b1fe..31fdb15 100644 --- a/webkit/Dockerfile +++ b/webkit/Dockerfile @@ -7,8 +7,8 @@ MAINTAINER kev RUN echo "Asia/Shanghai" > /etc/timezone RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN apt-get update && apt-get install -y supervisor haproxy libfontconfig1 libfreetype6 monit nginx -RUN mkdir -p /data/ /webkit/includes/ +RUN apt-get update && apt-get install -y supervisor haproxy libfontconfig1 libfreetype6 nginx +RUN mkdir -p /data/ /webkit/includes/ /var/lib/monit/events/ ADD ./*.js /webkit/ ADD ./includes/ /webkit/includes/ diff --git a/webkit/bin/monit b/webkit/bin/monit new file mode 100755 index 0000000..aa86037 Binary files /dev/null and b/webkit/bin/monit differ diff --git a/webkit/etc/supervisor/conf.d/monit.conf b/webkit/etc/supervisor/conf.d/monit.conf index 0bc3a57..f19052b 100644 --- a/webkit/etc/supervisor/conf.d/monit.conf +++ b/webkit/etc/supervisor/conf.d/monit.conf @@ -1,2 +1,2 @@ [program:monit] -command = /usr/bin/monit -I -c /etc/monit/monitrc +command = /usr/local/bin/monit -I -c /etc/monit/monitrc