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

Merge pull request #248 from mjschultz/master

Browse Source 
ECR: Respect the registry option
This commit is contained in:
Brad Rydzewski 2019-10-16 10:07:49 -10:00 committed by GitHub
commit 4c09b80365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -22,6 +22,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")
@ -49,7 +50,12 @@ func main() {
} }
svc := getECRClient(sess, assumeRole) svc := getECRClient(sess, assumeRole)
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))
} }