Skip to content

Commit 3e65c46

Browse files
authored
Update Dockerfile
Include these changes mattes#29
1 parent f75546f commit 3e65c46

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
FROM ubuntu:14.04
1+
FROM ubuntu:18.04
22
MAINTAINER Matthias Kadenbach <matthias.kadenbach@gmail.com>
33

4-
RUN echo 'deb http://deb.torproject.org/torproject.org trusty main' | tee /etc/apt/sources.list.d/torproject.list
5-
RUN gpg --keyserver keys.gnupg.net --recv 886DDD89
6-
RUN gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
4+
RUN echo 'deb http://deb.torproject.org/torproject.org trusty main' | tee /etc/apt/sources.list.d/torproject.list && \
5+
gpg --keyserver keys.gnupg.net --recv 886DDD89 && \
6+
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
77

8-
RUN echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' | tee /etc/apt/sources.list.d/ruby.list
9-
RUN gpg --keyserver keyserver.ubuntu.com --recv C3173AA6
10-
RUN gpg --export 80f70e11f0f0d5f10cb20e62f5da5f09c3173aa6 | apt-key add -
8+
RUN echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main' | tee /etc/apt/sources.list.d/ruby.list && \
9+
gpg --keyserver keyserver.ubuntu.com --recv C3173AA6 && \
10+
gpg --export 80f70e11f0f0d5f10cb20e62f5da5f09c3173aa6 | apt-key add -
1111

1212
RUN apt-get update && \
1313
apt-get install -y tor polipo haproxy ruby2.1 libssl-dev wget curl build-essential zlib1g-dev libyaml-dev libssl-dev && \
1414
ln -s /lib/x86_64-linux-gnu/libssl.so.1.0.0 /lib/libssl.so.1.0.0
1515

16-
RUN update-rc.d -f tor remove
17-
RUN update-rc.d -f polipo remove
16+
RUN update-rc.d -f tor remove && \
17+
update-rc.d -f polipo remove
1818

1919
RUN gem install excon -v 0.44.4
2020

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

30-
EXPOSE 5566 4444
30+
EXPOSE 5566 4646
3131

3232
CMD /usr/local/bin/start.rb

0 commit comments

Comments
 (0)