alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Updates docker/goamz dependency to support AWS profile env

Browse source 
Signed-off-by: Brian Bland <brian.bland@docker.com>
This commit is contained in:
Brian Bland 2016-02-02 18:10:03 -08:00
parent 586111b11e
commit ee4e6e3691
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Godeps/Godeps.json generated
View file

@ -77,15 +77,15 @@
}, },
{ {
"ImportPath": "github.com/docker/goamz/aws", "ImportPath": "github.com/docker/goamz/aws",
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8" "Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
}, },
{ {
"ImportPath": "github.com/docker/goamz/cloudfront", "ImportPath": "github.com/docker/goamz/cloudfront",
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8" "Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
}, },
{ {
"ImportPath": "github.com/docker/goamz/s3", "ImportPath": "github.com/docker/goamz/s3",
"Rev": "fb9c4c25c583d56a0544da8d1094294908c68ee8" "Rev": "29510ec7eba995a3750f6b38128c5318f8b71592"
}, },
{ {
"ImportPath": "github.com/docker/libtrust", "ImportPath": "github.com/docker/libtrust",

8
Godeps/_workspace/src/github.com/docker/goamz/aws/aws.go generated vendored
View file

@ -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 // 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) { func CredentialFileAuth(filePath string, profile string, expiration time.Duration) (auth Auth, err error) {
if profile == "" { if profile == "" {
profile = "default" profile = os.Getenv("AWS_DEFAULT_PROFILE")
if profile == "" {
profile = os.Getenv("AWS_PROFILE")
if profile == "" {
profile = "default"
}
}
} }
if filePath == "" { if filePath == "" {