From f2b0d9ce8adbbc8ca7e4f1ff18a34323e7535156 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <princess@docker.com>
Date: Sun, 26 Jul 2015 22:40:32 -0700
Subject: [PATCH] update various files

Signed-off-by: Jessica Frazelle <princess@docker.com>
---
 awscli/Dockerfile       | 13 +++++++++----
 cloudapp/Dockerfile     |  9 ++-------
 idonethis/.idonethisrc  |  2 --
 idonethis/Dockerfile    | 12 +++++++++---
 imagemin/Dockerfile     | 16 ++++++++++++----
 mitmproxy/Dockerfile    | 17 ++++++++++++++---
 t/Dockerfile            |  8 ++++----
 transmission/Dockerfile |  7 +++----
 8 files changed, 53 insertions(+), 31 deletions(-)
 delete mode 100644 idonethis/.idonethisrc

diff --git a/awscli/Dockerfile b/awscli/Dockerfile
index 5cc7e77..e5f9e31 100644
--- a/awscli/Dockerfile
+++ b/awscli/Dockerfile
@@ -7,9 +7,14 @@ RUN apk update && apk add \
 	python \
 	py-pip \
 	&& rm -rf /var/cache/apk/* \
-	&& pip install awscli
-
-RUN mkdir -p /root/.aws \
-	&& /bin/echo -e '[default]\noutput = json\nregion = $AMAZON_REGION\naws_access_key_id = $AMAZON_ACCESS_KEY_ID\naws_secret_access_key = $AMAZON_SECRET_ACCESS_KEY' > /root/.aws/config
+	&& pip install awscli \
+	&& mkdir -p /root/.aws \
+	&& { \
+		echo '[default]'; \
+		echo 'output = json'; \
+		echo 'region = $AMAZON_REGION'; \
+		echo 'aws_access_key_id = $AMAZON_ACCESS_KEY_ID'; \
+		echo 'aws_secret_access_key = $AMAZON_SECRET_ACCESS_KEY'; \
+	} > /root/.aws/config
 
 ENTRYPOINT [ "aws" ]
diff --git a/cloudapp/Dockerfile b/cloudapp/Dockerfile
index 5854b5d..6ad4842 100644
--- a/cloudapp/Dockerfile
+++ b/cloudapp/Dockerfile
@@ -4,12 +4,7 @@ MAINTAINER Jessica Frazelle <jess@docker.com>
 RUN apt-get update && apt-get install -y \
 	libcurl3-dev \
 	--no-install-recommends \ 
-	&& rm -rf /var/lib/apt/lists/*
-
-# update gems
-# and install cloudapp
-RUN gem update --system \
-	&& gem update \
-	&& gem install gem-man cloudapp
+	&& rm -rf /var/lib/apt/lists/* \
+	&& gem install cloudapp
 
 ENTRYPOINT ["cloudapp"]
diff --git a/idonethis/.idonethisrc b/idonethis/.idonethisrc
deleted file mode 100644
index 4711379..0000000
--- a/idonethis/.idonethisrc
+++ /dev/null
@@ -1,2 +0,0 @@
----
-sender: GmailSender
diff --git a/idonethis/Dockerfile b/idonethis/Dockerfile
index d33720b..867069c 100644
--- a/idonethis/Dockerfile
+++ b/idonethis/Dockerfile
@@ -7,10 +7,16 @@ RUN gem update --system \
 	&& gem install syck
 
 # install idonethis from git
-RUN git clone https://github.com/influitive/idonethis.git /idonethis
-RUN cd /idonethis; rake build; gem install /idonethis/pkg/idonethis-0.1.0.gem;
+RUN git clone https://github.com/influitive/idonethis.git /idonethis \
+	&& cd /idonethis \
+	&& rake build \
+	&& gem install /idonethis/pkg/idonethis-0.1.0.gem \
+	&& rm -rf /idonethis \
+	&& { \
+		echo '---'; \
+		echo 'sender: GmailSender'; \
+	} > /root/.idonethisrc
 
-COPY .idonethisrc /root/.idonethisrc
 COPY main.sh /main.sh
 
 ENTRYPOINT ["/main.sh"]
diff --git a/imagemin/Dockerfile b/imagemin/Dockerfile
index 106280e..76efbb4 100644
--- a/imagemin/Dockerfile
+++ b/imagemin/Dockerfile
@@ -6,10 +6,18 @@
 #	--entrypoint bash \
 #	jess/imagemin
 #
-FROM node
+FROM alpine
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN npm install --global imagemin
+RUN apk update && apk add \
+	autoconf \
+	automake \
+	build-base \
+	file \
+	libpng-dev \
+	nasm \
+	nodejs \
+	&& rm -rf /var/cache/apk/* \
+	&& npm install --global imagemin
 
-ENTRYPOINT [ "imagemin" ]
-CMD [ "--help" ]
+CMD [ "imagemin", "--help" ]
diff --git a/mitmproxy/Dockerfile b/mitmproxy/Dockerfile
index 6b3dc7b..d04eac3 100644
--- a/mitmproxy/Dockerfile
+++ b/mitmproxy/Dockerfile
@@ -1,6 +1,17 @@
-FROM python:2.7.8
+FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN pip install mitmproxy
+RUN apk update && apk add \
+	build-base \
+	ca-certificates \
+	libffi-dev \
+	libxml2-dev \
+	libxslt-dev \
+	openssl-dev \
+	python \
+	python-dev \
+	py-pip \
+	&& rm -rf /var/cache/apk/* \
+	&& pip install mitmproxy
 
-ENTRYPOINT [ "mitmproxy" ]
+CMD [ "mitmproxy" ]
diff --git a/t/Dockerfile b/t/Dockerfile
index 74d9f40..b5aa2a7 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine:latest
+MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apk update && apk add \
+	build-base \
 	ca-certificates \
 	ruby-dev \
-	build-base \
-	&& rm -rf /var/cache/apk/*
-
-RUN gem install t
+	&& rm -rf /var/cache/apk/* \
+	&& gem install t
 
 ENTRYPOINT [ "t" ]
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 41926ab..fef5869 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -19,13 +19,12 @@
 #
 
 # Base docker image
-FROM debian:jessie
+FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN apt-get update && apt-get install -y \
+RUN apk update && apk add \
 	transmission-daemon \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/cache/apk/* \
 	&& mkdir -p /transmission/{download,watch,incomplete,config} \
 	&& chmod 1777 /transmission