Skip to content

Commit

Permalink
Update Dockerfile
Browse files Browse the repository at this point in the history
Include these changes
mattes#29
  • Loading branch information
sbatururimi committed Apr 3, 2019
1 parent f75546f commit 3e65c46
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM ubuntu:14.04
FROM ubuntu:18.04
MAINTAINER Matthias Kadenbach <[email protected]>

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 -
RUN echo 'deb http://deb.torproject.org/torproject.org trusty main' | tee /etc/apt/sources.list.d/torproject.list && \
gpg --keyserver keys.gnupg.net --recv 886DDD89 && \
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -

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 -
RUN echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' | tee /etc/apt/sources.list.d/ruby.list && \
gpg --keyserver keyserver.ubuntu.com --recv C3173AA6 && \
gpg --export 80f70e11f0f0d5f10cb20e62f5da5f09c3173aa6 | apt-key add -

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 update-rc.d -f tor remove
RUN update-rc.d -f polipo remove
RUN update-rc.d -f tor remove && \
update-rc.d -f polipo remove

RUN gem install excon -v 0.44.4

Expand All @@ -27,6 +27,6 @@ RUN chmod +x /usr/local/bin/newnym.sh
ADD haproxy.cfg.erb /usr/local/etc/haproxy.cfg.erb
ADD uncachable /etc/polipo/uncachable

EXPOSE 5566 4444
EXPOSE 5566 4646

CMD /usr/local/bin/start.rb

0 comments on commit 3e65c46

Please sign in to comment.