tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-30 00:54:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move config initialization closer to the beginning

Browse Source
This commit is contained in:
Djordje Lukic 2020-05-04 11:27:31 +02:00
parent 6aec90c506
commit 63c460240c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure/aci.go
View File

@ -29,7 +29,7 @@ func init() {
_ = os.Setenv("AZURE_KEYVAULT_RESOURCE", "https://management.azure.com") _ = os.Setenv("AZURE_KEYVAULT_RESOURCE", "https://management.azure.com")
} }
func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) (containerinstance.ContainerGroup, error) { func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) (c containerinstance.ContainerGroup, err error) {
containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID) containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID)
if err != nil { if err != nil {
return c, fmt.Errorf("cannot get container group client: %v", err) return c, fmt.Errorf("cannot get container group client: %v", err)

11
compose/project.go
View File

@ -44,15 +44,18 @@ func ProjectFromOptions(options *ProjectOptions) (*Project, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
configs, err := parseConfigs(configPath)
if err != nil {
return nil, err
}
name := options.Name name := options.Name
if name == "" { if name == "" {
r := regexp.MustCompile(`[^a-z0-9\\-_]+`) r := regexp.MustCompile(`[^a-z0-9\\-_]+`)
name = r.ReplaceAllString(strings.ToLower(filepath.Base(options.WorkDir)), "") name = r.ReplaceAllString(strings.ToLower(filepath.Base(options.WorkDir)), "")
} }
configs, err := parseConfigs(configPath)
if err != nil {
return nil, err
}
return newProject(types.ConfigDetails{ return newProject(types.ConfigDetails{
WorkingDir: options.WorkDir, WorkingDir: options.WorkDir,
ConfigFiles: configs, ConfigFiles: configs,