tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #256 from docker/aci_fix_context_location 

Use location flag in aci context creation only for group creation
This commit is contained in:
Guillaume Tardif 2020-06-22 10:18:00 +02:00 committed by GitHub
parent ec5faa9eb8 309069f545
commit a2cfcf1124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
azure/context.go
View File

@ -77,10 +77,7 @@ func (helper contextCreateACIHelper) createContextData(ctx context.Context, opts
} }
} }
location := opts["aciLocation"] location := *group.Location
if location == "" {
location = *group.Location
}
description := fmt.Sprintf("%s@%s", *group.Name, location) description := fmt.Sprintf("%s@%s", *group.Name, location)
if opts["description"] != "" { if opts["description"] != "" {

1
azure/context_test.go
View File

@ -179,6 +179,7 @@ func options(subscriptionID string, resourceGroupName string) map[string]string
return map[string]string{ return map[string]string{
"aciSubscriptionID": subscriptionID, "aciSubscriptionID": subscriptionID,
"aciResourceGroup": resourceGroupName, "aciResourceGroup": resourceGroupName,
"aciLocation": "eastus",
} }
} }