@@ -46,6 +46,7 @@ whichrelease:

 release: $(BINRELEASE)

 	s3cmd -P put $(BINRELEASE) s3://get.docker.io/builds/`uname -s`/`uname -m`/docker-$(RELEASE_VERSION).tgz

+	s3cmd -P put docker-latest.tgz s3://get.docker.io/builds/`uname -s`/`uname -m`/docker-latest.tgz

 srcrelease: $(SRCRELEASE)

 deps: $(DOCKER_DIR)

@@ -60,6 +61,7 @@ $(SRCRELEASE):

 $(BINRELEASE): $(SRCRELEASE)

 	rm -f $(BINRELEASE)

 	cd $(SRCRELEASE); make; cp -R bin docker-$(RELEASE_VERSION); tar -f ../$(BINRELEASE) -zv -c docker-$(RELEASE_VERSION)

+	cd $(SRCRELEASE); cp -R bin docker-latest; tar -f ../docker-latest.tgz -zv -c docker-latest

 clean:

 	@rm -rf $(dir $(DOCKER_BIN))

@@ -27,5 +27,4 @@ run	apt-get install -y -q devscripts

 # Copy dockerbuilder files into the container

 add	.       /src

 run	cp /src/dockerbuilder /usr/local/bin/ && chmod +x /usr/local/bin/dockerbuilder

-run	cp /src/s3cfg /.s3cfg

 cmd	["dockerbuilder"]

@@ -13,12 +13,10 @@ fi

 export REVISION=$1

-if [ -z "$AWS_ID" ]; then

-	echo "Warning: environment variable AWS_ID is not set. Won't upload to S3."

-fi

-

-if [ -z "$AWS_KEY" ]; then

-	echo "Warning: environment variable AWS_KEY is not set. Won't upload to S3."

+if [ -z "$AWS_ID" -o -z "$AWS_KEY" ]; then

+	echo "Warning: either AWS_ID or AWS_KEY environment variable not set. Won't upload to S3."

+else

+	/bin/echo -e "[default]\naccess_key = $AWS_ID\nsecret_key = $AWS_KEY\n" > /.s3cfg

 fi

 if [ -z "$GPG_KEY" ]; then

@@ -35,6 +33,9 @@ else

 	make release RELEASE_VERSION=$REVISION

 fi

+# Remove credentials from container

+rm -f /.s3cfg

+

 if [ -z "$NO_UBUNTU" ]; then

 	export PATH=`echo $PATH | sed 's#/usr/local/go/bin:##g'`

 	(cd packaging/ubuntu && make ubuntu)

deleted file mode 100644

@@ -1,3 +0,0 @@

-[default]

-access_key = $AWS_ID

-secret_key = $AWS_KEY