diff --git a/webkit/Dockerfile b/webkit/Dockerfile index 6ce8974..ca7f869 100644 --- a/webkit/Dockerfile +++ b/webkit/Dockerfile @@ -7,19 +7,21 @@ 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 nginx +RUN apt-get update && apt-get install -y supervisor haproxy nginx libfontconfig1 libfreetype6 fontconfig RUN mkdir -p /data/ /webkit/includes/ ADD ./*.js /webkit/ ADD ./includes/ /webkit/includes/ ADD ./bin/ /usr/local/bin/ -ADD ./etc/haproxy.cfg /etc/haproxy/ ADD ./etc/supervisor/supervisord.conf /etc/supervisor/ ADD ./etc/supervisor/conf.d/ /etc/supervisor/conf.d/ -ADD ./etc/monitrc /etc/ +ADD ./etc/haproxy.cfg /etc/haproxy/ ADD ./etc/nginx.cfg /etc/nginx/sites-enabled/default +ADD ./etc/monitrc /etc/ +ADD ./fonts/ /usr/local/share/fonts/ RUN chmod 600 /etc/monitrc +RUN fc-cache -f -v VOLUME /data/ EXPOSE 80 1024 2812 9001 diff --git a/webkit/fonts/Songti.ttc b/webkit/fonts/Songti.ttc new file mode 100644 index 0000000..3ccc999 Binary files /dev/null and b/webkit/fonts/Songti.ttc differ