1
2
mirror of https://github.com/vimagick/dockerfiles synced 2024-06-16 11:58:47 +00:00

add polipo

This commit is contained in:
kev 2015-03-19 23:37:55 +08:00
parent e6e4c250eb
commit 90cd7e3a80
2 changed files with 9 additions and 3 deletions

@ -6,7 +6,7 @@ FROM ubuntu:14.04
MAINTAINER kev <noreply@datageek.info>
RUN apt-get update
RUN apt-get install -y build-essential pdnsd haproxy nginx python
RUN apt-get install -y build-essential pdnsd haproxy polipo nginx python
RUN apt-get clean
ADD ./supervisord.conf /etc/supervisor/
@ -14,6 +14,7 @@ ADD ./services.conf /etc/supervisor/conf.d/
ADD ./pdnsd.conf /etc/
ADD ./shadowsocks /etc/shadowsocks
ADD ./haproxy.cfg /etc/haproxy/
ADD ./polipo.conf /etc/polipo/config
ADD https://download.libsodium.org/libsodium/releases/libsodium-1.0.2.tar.gz /tmp/pkgs/
ADD http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.4.3.tar.gz /tmp/pkgs/
@ -36,6 +37,6 @@ RUN tar xzf dnscrypt-proxy-1.4.3.tar.gz && \
WORKDIR /
RUN rm -r /tmp/pkgs/
EXPOSE 80 1080 9001
EXPOSE 80 1080 8123 9001
CMD supervisord -n -c /etc/supervisor/supervisord.conf

@ -17,7 +17,12 @@ process_name = %(process_num)d
priority = 400
command = haproxy -f /etc/haproxy/haproxy.cfg
[program:nginx]
[program:polipo]
priority = 500
command = /usr/bin/polipo -c /etc/polipo/config
user = polipo
[program:nginx]
priority = 600
command = nginx -g "daemon off; error_log stderr;"