From 8ba24e763c098366bd9fddeb3a7900b2699ac027 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <acidburn@docker.com>
Date: Sat, 31 Oct 2015 17:52:38 -0700
Subject: [PATCH] cleanup;

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
---
 openvpn/Dockerfile       |  9 ++++++---
 tor-messenger/Dockerfile | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/openvpn/Dockerfile b/openvpn/Dockerfile
index 6df0a12..954192e 100644
--- a/openvpn/Dockerfile
+++ b/openvpn/Dockerfile
@@ -1,4 +1,7 @@
-FROM alpine
-RUN apk update && apk add openvpn
-ENTRYPOINT ["openvpn"]
+FROM alpine:latest
+RUN apk update && apk add \
+	openvpn \
+	&& rm -rf /var/cache/apk/*
+
 WORKDIR /etc/openvpn
+ENTRYPOINT ["openvpn"]
diff --git a/tor-messenger/Dockerfile b/tor-messenger/Dockerfile
index 6935d3e..ad3d792 100644
--- a/tor-messenger/Dockerfile
+++ b/tor-messenger/Dockerfile
@@ -3,29 +3,28 @@
 # docker run -d \
 #	-v /tmp/.X11-unix:/tmp/.X11-unix \
 #	-e DISPLAY=unix$DISPLAY \
-#	tor-messenger
+#	jess/tor-messenger
 #
-
 FROM debian:sid
 MAINTAINER Christian Koep <christian.koep@fom-net.de>
 
-ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /home/user
 ENV LANG C.UTF-8
 ENV TOR_VERSION 0.1.0b3
 ENV TOR_FINGERPRINT 0x6887935AB297B391
 
-RUN apt-get update && apt-get -y --no-install-recommends install \
+RUN apt-get update && apt-get -y install \
+	ca-certificates \
 	curl \
+	gxmessage \
+	libasound2 \
+	libdbus-glib-1-2 \
+	libxt6 \
 	tar \
 	xz-utils \
 	zenity \
-	gxmessage \
-	ca-certificates \
-	libasound2 \
-	libdbus-glib-1-2 \
-	libxt6 && \
-	rm -rf /var/lib/apt/lists/*
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN useradd --create-home --home-dir $HOME user && chown -R user:user $HOME
 
@@ -41,7 +40,8 @@ RUN cd /tmp && \
 	tar xfv tor-messenger-linux64-${TOR_VERSION}_en-US.tar.xz -C /usr/local/bin && \
 	rm -rf tor-messenger*	&& \
 	chown -R user.user /usr/local/bin/tor-messenger && \
-	rm -rf ~/.gnupg
+	rm -rf ~/.gnupg && \
+	rm -rf /tmp
 
 WORKDIR $HOME