From f3131a00f08f9aa7392d0a3403c4e9a7f5c83b7e Mon Sep 17 00:00:00 2001 From: Gabor Garami Date: Tue, 9 Feb 2016 16:53:32 +0100 Subject: [PATCH 1/2] Update to Ubuntu Trusty --- Dockerfile | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81c6304..58bad95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,18 @@ # Tinyproxy (https://banu.com/tinyproxy/) -FROM ubuntu:precise +FROM ubuntu:trusty MAINTAINER Ryan Seto -RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list && \ - apt-get update && \ - apt-get upgrade +RUN apt-get update && \ + apt-get -y upgrade && \ + apt-get -y install tinyproxy && \ + rm -rf /var/lib/apt/lists/* # Ensure UTF-8 RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 -# Prevent apt-get from complaining with: Unable to connect to Upstart -RUN dpkg-divert --local --rename --add /sbin/initctl && \ - ln -s /bin/true /sbin/initctl - -# Install Tinyproxy -RUN apt-get -y install tinyproxy - -# Configure Tinyproxy -# This allows allows all connections. -RUN sed -i -e"s/^Allow /#Allow /" /etc/tinyproxy.conf - USER nobody EXPOSE 8888 ENTRYPOINT ["/usr/sbin/tinyproxy", "-d"] From 2e61577965834ec3a0b945a094531d186b21cb82 Mon Sep 17 00:00:00 2001 From: Gabor Garami Date: Tue, 9 Feb 2016 16:55:55 +0100 Subject: [PATCH 2/2] Add back config editing --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 58bad95..8259264 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,10 @@ RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +# Configure Tinyproxy +# This allows allows all connections. +RUN sed -i -e"s/^Allow /#Allow /" /etc/tinyproxy.conf + USER nobody EXPOSE 8888 ENTRYPOINT ["/usr/sbin/tinyproxy", "-d"]