From 7be073bc3f1dbed8b5e1f6316e76e866a940f2b7 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <me@jessfraz.com>
Date: Thu, 11 Aug 2016 15:43:41 -0700
Subject: [PATCH] small fixes

Signed-off-by: Jess Frazelle <me@jessfraz.com>
---
 build-all.sh             | 32 +++++++++++++++-----------------
 chrome/beta/Dockerfile   |  2 +-
 chrome/stable/Dockerfile |  2 +-
 t/Dockerfile             | 19 ++++++++++++-------
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/build-all.sh b/build-all.sh
index 30b342e..7ed882d 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -6,11 +6,9 @@ build_and_push(){
 	suite=$2
 	build_dir=$3
 
-	(
-	set -x
-	docker build --rm --force-rm -t r.j3ss.co/${base}:${suite} ${build_dir} || exit 1
-	)
+	docker build --rm --force-rm -t r.j3ss.co/${base}:${suite} ${build_dir} || return 1
 
+	# on successful build, push the image
 	echo "                       ---                                   "
 	echo "Successfully built ${base}:${suite} with context ${build_dir}"
 	echo "                       ---                                   "
@@ -30,7 +28,6 @@ build_and_push(){
 		docker tag r.j3ss.co/${base}:${suite} r.j3ss.co/${base}:latest
 		docker push --disable-content-trust=false r.j3ss.co/${base}:latest
 	fi
-
 }
 
 main(){
@@ -58,19 +55,20 @@ main(){
 		{
 			build_and_push "${base}" "${suite}" "${build_dir}"
 		} || {
-			# add to errors
-			ERRORS+=("${base}:${suite}")
-		}
-		echo
-		echo
-	done
+		# add to errors
+		ERRORS+=("${base}:${suite}")
+	}
+	echo
+	echo
+done
 
-	if [ ${#ERRORS[@]} -eq 0 ]; then
-    	echo "No errors, hooray"
-	else
-    	echo "These images failed: ${ERRORS[@]}"
-		exit 1
-	fi
+if [ ${#ERRORS[@]} -eq 0 ]; then
+	echo "No errors, hooray!"
+else
+	echo "[ERROR] Some images did not build correctly, see below." >&2
+	echo "These images failed: ${ERRORS[@]}" >&2
+	exit 1
+fi
 }
 
 main $@
diff --git a/chrome/beta/Dockerfile b/chrome/beta/Dockerfile
index e6aa721..591d228 100644
--- a/chrome/beta/Dockerfile
+++ b/chrome/beta/Dockerfile
@@ -28,7 +28,7 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
 	hicolor-icon-theme \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
-        libpulse0 \
+	libpulse0 \
 	libv4l-0 \
 	-t testing \
 	fonts-symbola \
diff --git a/chrome/stable/Dockerfile b/chrome/stable/Dockerfile
index a0c2055..80017a6 100644
--- a/chrome/stable/Dockerfile
+++ b/chrome/stable/Dockerfile
@@ -28,7 +28,7 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
 	hicolor-icon-theme \
 	libgl1-mesa-dri \
 	libgl1-mesa-glx \
-        libpulse0 \
+	libpulse0 \
 	libv4l-0 \
 	-t testing \
 	fonts-symbola \
diff --git a/t/Dockerfile b/t/Dockerfile
index 8f39091..7ab7a57 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,11 +1,16 @@
-FROM alpine:latest
+FROM ruby:2-alpine
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
-RUN apk --no-cache add \
-	build-base \
-	ca-certificates \
-	ruby \
-	ruby-dev \
-	&& gem install --no-document io-console t
+RUN apk add --no-cache \
+	ca-certificates
+
+RUN set -x \
+        && apk add --no-cache --virtual .build-deps \
+                build-base \
+        && gem install \
+                io-console \
+				t \
+                --no-rdoc --no-ri \
+        && apk del .build-deps
 
 ENTRYPOINT [ "t" ]