From 3f2afd894d3a5d2f5e27ff2281ef71400535f005 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <acidburn@docker.com>
Date: Tue, 11 Aug 2015 20:53:04 -0700
Subject: [PATCH] bump tor-browser version and add alpha

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
---
 tor-browser/{ => alpha}/Dockerfile |  2 +-
 tor-browser/{ => alpha}/local.conf |  0
 tor-browser/stable/Dockerfile      | 40 ++++++++++++++++++++++++++++++
 tor-browser/stable/local.conf      | 29 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)
 rename tor-browser/{ => alpha}/Dockerfile (97%)
 rename tor-browser/{ => alpha}/local.conf (100%)
 create mode 100644 tor-browser/stable/Dockerfile
 create mode 100644 tor-browser/stable/local.conf

diff --git a/tor-browser/Dockerfile b/tor-browser/alpha/Dockerfile
similarity index 97%
rename from tor-browser/Dockerfile
rename to tor-browser/alpha/Dockerfile
index e938427..8ab5750 100644
--- a/tor-browser/Dockerfile
+++ b/tor-browser/alpha/Dockerfile
@@ -26,7 +26,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV TOR_VERSION 4.5.3
+ENV TOR_VERSION 5.5a1
 
 RUN curl -sSL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz" | tar -v -C /usr/local/bin -xJ --strip-components 1 
 
diff --git a/tor-browser/local.conf b/tor-browser/alpha/local.conf
similarity index 100%
rename from tor-browser/local.conf
rename to tor-browser/alpha/local.conf
diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile
new file mode 100644
index 0000000..678850e
--- /dev/null
+++ b/tor-browser/stable/Dockerfile
@@ -0,0 +1,40 @@
+# Run tor browser in a container
+#
+# docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-v /dev/snd:/dev/snd \
+#	-e DISPLAY=unix$DISPLAY \
+#	jess/tor-browser
+#
+FROM debian:jessie
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN apt-get update && apt-get install -y \
+	ca-certificates \
+	curl \
+	libasound2 \
+	libdbus-glib-1-2 \
+	libgtk2.0-0 \
+	libxrender1 \
+	libxt6 \
+	xz-utils \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
+
+ENV HOME /home/user
+RUN useradd --create-home --home-dir $HOME user \
+	&& chown -R user:user $HOME
+
+ENV LANG C.UTF-8
+
+ENV TOR_VERSION 5.0
+
+RUN curl -sSL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz" | tar -v -C /usr/local/bin -xJ --strip-components 1 
+
+# good fonts
+COPY local.conf /etc/fonts/local.conf
+
+WORKDIR $HOME
+USER user
+
+ENTRYPOINT ["/bin/bash"]
+CMD [ "/usr/local/bin/Browser/start-tor-browser" ]
diff --git a/tor-browser/stable/local.conf b/tor-browser/stable/local.conf
new file mode 100644
index 0000000..51dd0d3
--- /dev/null
+++ b/tor-browser/stable/local.conf
@@ -0,0 +1,29 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+<match target="font">
+<edit mode="assign" name="rgba">
+<const>rgb</const>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="hinting">
+<bool>true</bool>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="hintstyle">
+<const>hintslight</const>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="antialias">
+<bool>true</bool>
+</edit>
+</match>
+<match target="font">
+<edit mode="assign" name="lcdfilter">
+<const>lcddefault</const>
+</edit>
+</match>
+</fontconfig>