PapaTutuWawa/woodpecker-docker-buildx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'benwilson512/master'

Browse Source
This commit is contained in:
Michael J. Schultz 2019-08-15 12:08:48 -05:00
commit 7b060dd935
No known key found for this signature in database
GPG Key ID: 979BD6F7C7C9F90E
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/drone-ecr/main.go
View File

@ -21,6 +21,7 @@ const defaultRegion = "us-east-1"
func main() { func main() {
var ( var (
repo = getenv("PLUGIN_REPO") repo = getenv("PLUGIN_REPO")
registry = getenv("PLUGIN_REGISTRY")
region = getenv("PLUGIN_REGION", "ECR_REGION", "AWS_REGION") region = getenv("PLUGIN_REGION", "ECR_REGION", "AWS_REGION")
key = getenv("PLUGIN_ACCESS_KEY", "ECR_ACCESS_KEY", "AWS_ACCESS_KEY_ID") key = getenv("PLUGIN_ACCESS_KEY", "ECR_ACCESS_KEY", "AWS_ACCESS_KEY_ID")
secret = getenv("PLUGIN_SECRET_KEY", "ECR_SECRET_KEY", "AWS_SECRET_ACCESS_KEY") secret = getenv("PLUGIN_SECRET_KEY", "ECR_SECRET_KEY", "AWS_SECRET_ACCESS_KEY")
@ -48,7 +49,12 @@ func main() {
} }
svc := ecr.New(sess) svc := ecr.New(sess)
username, password, registry, err := getAuthInfo(svc) username, password, defaultRegistry, err := getAuthInfo(svc)
if registry == "" {
registry = defaultRegistry
}
if err != nil { if err != nil {
log.Fatal(fmt.Sprintf("error getting ECR auth: %v", err)) log.Fatal(fmt.Sprintf("error getting ECR auth: %v", err))
} }