Merge pull request mattes#6 from mattes/fixes

Random updates

Author: mattes

Dockerfile

@@ -1,36 +1,28 @@
 FROM ubuntu:14.04
 MAINTAINER Matthias Kadenbach <matthias.kadenbach@gmail.com>
 
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install libssl-dev wget curl -y
-RUN apt-get install build-essential zlib1g-dev libyaml-dev libssl-dev -y
-RUN ln -s /lib/x86_64-linux-gnu/libssl.so.1.0.0 /lib/libssl.so.1.0.0
-
-# Tor
 RUN echo 'deb http://deb.torproject.org/torproject.org trusty main' | tee /etc/apt/sources.list.d/torproject.list
 RUN gpg --keyserver keys.gnupg.net --recv 886DDD89
 RUN gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
 
-# Ruby
 RUN echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' | tee /etc/apt/sources.list.d/ruby.list
 RUN gpg --keyserver keyserver.ubuntu.com --recv C3173AA6
 RUN gpg --export 80f70e11f0f0d5f10cb20e62f5da5f09c3173aa6 | apt-key add -
 
-# Services
-RUN apt-get update
-RUN apt-get install tor polipo haproxy ruby2.1 -y
+RUN apt-get update && \
+    apt-get install -y tor polipo haproxy ruby2.1 libssl-dev wget curl build-essential zlib1g-dev libyaml-dev libssl-dev && \
+    ln -s /lib/x86_64-linux-gnu/libssl.so.1.0.0 /lib/libssl.so.1.0.0
 
-RUN service tor stop
-RUN service polipo stop
 RUN update-rc.d -f tor remove
 RUN update-rc.d -f polipo remove
 
-EXPOSE 5566
-
-RUN gem install excon
+RUN gem install excon -v 0.44.4
 
-ADD usr/local/etc/haproxy.cfg.erb /usr/local/etc/haproxy.cfg.erb
-ADD usr/local/bin/start.rb /usr/local/bin/start.rb
+ADD start.rb /usr/local/bin/start.rb
 RUN chmod +x /usr/local/bin/start.rb
-CMD /usr/local/bin/start.rb
+
+ADD haproxy.cfg.erb /usr/local/etc/haproxy.cfg.erb
+
+EXPOSE 5566 1936
+
+CMD /usr/local/bin/start.rb

Makefile

@@ -22,16 +22,15 @@ docker build -t mattes/rotating-proxy:latest .
 # ... or pull docker container
 docker pull mattes/rotating-proxy:latest
 
-# debug docker container
-docker run -v $(pwd):/home -p 5566:5566 -i -t --env tors=10 mattes/rotating-proxy /bin/bash
-source <(curl -Ls git.io/apeepg) # inject dotfiles
-
 # start docker container
-docker run -d -p 5566:5566 --env tors=25 mattes/rotating-proxy
+docker run -d -p 5566:5566 -p 1936:1936 --env tors=25 mattes/rotating-proxy
 
 # test with ...
 curl --proxy 127.0.0.1:5566 http://echoip.com
 curl --proxy 127.0.0.1:5566 http://header.jsontest.com
+
+# monitor
+http://127.0.0.1:1936/haproxy?stats
 ```
 
 

README.md

@@ -14,20 +14,19 @@ defaults
   timeout server 60s
 
 
-# listen stats *:1936
-#   mode            http
-#   log             global
-#   maxconn 10
-#   clitimeout      100s
-#   srvtimeout      100s
-#   contimeout      100s
-#   timeout queue   100s
-#   stats enable
-#   stats hide-version
-#   stats refresh 30s
-#   stats show-node
-#   stats auth admin:admin123
-#   stats uri /haproxy?stats
+listen stats *:1936
+  mode            http
+  log             global
+  maxconn 10
+  clitimeout      100s
+  srvtimeout      100s
+  contimeout      100s
+  timeout queue   100s
+  stats enable
+  stats hide-version
+  stats refresh 30s
+  stats show-node
+  stats uri /haproxy?stats
 
 
 frontend rotating_proxies