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

implement model_variable

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-06-30 21:26:22 +02:00 committed by Guillaume Lours
parent 5cf1f0e2a4
commit 317ebcd3b0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/compose/model.go
View File

@ -75,7 +75,7 @@ func (s *composeService) ensureModels(ctx context.Context, project *types.Projec
eg, gctx := errgroup.WithContext(ctx) eg, gctx := errgroup.WithContext(ctx)
eg.Go(func() error { eg.Go(func() error {
return s.setModelEndpointVariable(gctx, dockerModel, project) return s.setModelVariables(gctx, dockerModel, project)
}) })
for name, config := range project.Models { for name, config := range project.Models {
@ -161,7 +161,7 @@ func (s *composeService) configureModel(ctx context.Context, dockerModel *manage
return cmd.Run() return cmd.Run()
} }
func (s *composeService) setModelEndpointVariable(ctx context.Context, dockerModel *manager.Plugin, project *types.Project) error { func (s *composeService) setModelVariables(ctx context.Context, dockerModel *manager.Plugin, project *types.Project) error {
cmd := exec.CommandContext(ctx, dockerModel.Path, "status", "--json") cmd := exec.CommandContext(ctx, dockerModel.Path, "status", "--json")
s.setupChildProcess(ctx, cmd) s.setupChildProcess(ctx, cmd)
statusOut, err := cmd.CombinedOutput() statusOut, err := cmd.CombinedOutput()
@ -179,12 +179,21 @@ func (s *composeService) setModelEndpointVariable(ctx context.Context, dockerMod
} }
for _, service := range project.Services { for _, service := range project.Services {
for model, modelConfig := range service.Models { for ref, modelConfig := range service.Models {
model := project.Models[ref]
varPrefix := strings.ReplaceAll(strings.ToUpper(ref), "-", "_")
var variable string var variable string
if modelConfig != nil && modelConfig.ModelVariable != "" {
variable = modelConfig.ModelVariable
} else {
variable = varPrefix
}
service.Environment[variable] = &model.Model
if modelConfig != nil && modelConfig.EndpointVariable != "" { if modelConfig != nil && modelConfig.EndpointVariable != "" {
variable = modelConfig.EndpointVariable variable = modelConfig.EndpointVariable
} else { } else {
variable = strings.ToUpper(model) + "_URL" variable = varPrefix + "_URL"
} }
service.Environment[variable] = &status.Endpoint service.Environment[variable] = &status.Endpoint
} }