Merge branch 'v4.3.x'

330cb92b · Torkel Ödegaard · 36953379 · befc15c5 · 330cb92b
Commit 330cb92b authored May 23, 2017 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

pkg/components/imguploader/s3uploader.go
+4 -0

No files found.
--- a/pkg/components/imguploader/s3uploader.go
+++ b/pkg/components/imguploader/s3uploader.go
@@ -78,5 +78,9 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
 		return "", err
 	}

+	if u.region == "us-east-1" {
+		return "https://" + u.bucket + ".s3.amazonaws.com/" + key, nil
+	} else {
 		return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
+	}
 }