From ee4e6e36911e61364ce487d5634e6dab076f25a8 Mon Sep 17 00:00:00 2001
From: Brian Bland <brian.bland@docker.com>
Date: Tue, 2 Feb 2016 18:10:03 -0800
Subject: [PATCH] Updates docker/goamz dependency to support AWS profile env

Signed-off-by: Brian Bland <brian.bland@docker.com>
---
 Godeps/Godeps.json                                       | 6 +++---
 Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 72d4617a9..4f281e209 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -77,15 +77,15 @@
 		},
 		{
 			"ImportPath": "github.com/docker/goamz/aws",
-			"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
+			"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
 		},
 		{
 			"ImportPath": "github.com/docker/goamz/cloudfront",
-			"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
+			"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
 		},
 		{
 			"ImportPath": "github.com/docker/goamz/s3",
-			"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8"
+			"Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
 		},
 		{
 			"ImportPath": "github.com/docker/libtrust",
diff --git a/Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go b/Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go
index 9939f92cf..013b2536a 100644
--- a/Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go
+++ b/Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go
@@ -405,7 +405,13 @@ func EnvAuth() (auth Auth, err error) {
 // http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
 func CredentialFileAuth(filePath string, profile string, expiration time.Duration) (auth Auth, err error) {
 	if profile == "" {
-		profile = "default"
+		profile = os.Getenv("AWS_DEFAULT_PROFILE")
+		if profile == "" {
+			profile = os.Getenv("AWS_PROFILE")
+			if profile == "" {
+				profile = "default"
+			}
+		}
 	}
 
 	if filePath == "" {