Skip to content

Update to Ubuntu Trusty #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hron84 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Ubuntu Trusty #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3131a0
Update to Ubuntu Trusty
Feb 9, 2016
2e61577
Add back config editing
Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
# Tinyproxy (https://banu.com/tinyproxy/)

FROM ubuntu:precise
FROM ubuntu:trusty
MAINTAINER Ryan Seto <ryanseto@yak.net>

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
Expand Down