From c08d245539ef4d721b874392097016a1c8c8fb81 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Thu, 2 May 2013 18:11:54 -0700
Subject: [PATCH] dockerbuilder: let the Makefile upload to s3 with 'make
 release'

---
 hack/dockerbuilder/dockerbuilder | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/hack/dockerbuilder/dockerbuilder b/hack/dockerbuilder/dockerbuilder
index 500a82db9f..4287e0b336 100644
--- a/hack/dockerbuilder/dockerbuilder
+++ b/hack/dockerbuilder/dockerbuilder
@@ -15,12 +15,10 @@ export REVISION=$1
 
 if [ -z "$AWS_ID" ]; then
 	echo "Warning: environment variable AWS_ID is not set. Won't upload to S3."
-	NO_S3=1
 fi
 
 if [ -z "$AWS_KEY" ]; then
 	echo "Warning: environment variable AWS_KEY is not set. Won't upload to S3."
-	NO_S3=1
 fi
 
 if [ -z "$GPG_KEY" ]; then
@@ -28,28 +26,15 @@ if [ -z "$GPG_KEY" ]; then
 	NO_UBUNTU=1
 fi
 
-if [ -z "$REVISION" ]; then
-	rm -fr docker-master
-	git clone https://github.com/dotcloud/docker docker-master
-	cd docker-master
-else 
-	rm -fr docker-$REVISION
-	git init docker-$REVISION
-	cd docker-$REVISION
-	git fetch -t https://github.com/dotcloud/docker $REVISION:$REVISION
-	git reset --hard FETCH_HEAD
-fi
-
+rm -fr docker-release
+git clone https://github.com/dotcloud/docker docker-release
+cd docker-release
 if [ -z "$REVISION" ]; then
 	make release
 else
 	make release RELEASE_VERSION=$REVISION
 fi
 
-if [ -z "$NO_S3" ]; then
-	s3cmd -P put docker-$REVISION.tgz s3://get.docker.io/builds/$(uname -s)/$(uname -m)/docker-$REVISION.tgz
-fi
-
 if [ -z "$NO_UBUNTU" ]; then
 	(cd packaging/ubuntu && make ubuntu)
 fi