Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pkg/compose/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (s *composeService) ensureModels(ctx context.Context, project *types.Projec

eg, gctx := errgroup.WithContext(ctx)
eg.Go(func() error {
return s.setModelEndpointVariable(gctx, dockerModel, project)
return s.setModelVariables(gctx, dockerModel, project)
})

for name, config := range project.Models {
Expand Down Expand Up @@ -161,7 +161,7 @@ func (s *composeService) configureModel(ctx context.Context, dockerModel *manage
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")
s.setupChildProcess(ctx, cmd)
statusOut, err := cmd.CombinedOutput()
Expand All @@ -179,12 +179,21 @@ func (s *composeService) setModelEndpointVariable(ctx context.Context, dockerMod
}

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
if modelConfig != nil && modelConfig.ModelVariable != "" {
variable = modelConfig.ModelVariable
} else {
variable = varPrefix
}
service.Environment[variable] = &model.Model

if modelConfig != nil && modelConfig.EndpointVariable != "" {
variable = modelConfig.EndpointVariable
} else {
variable = strings.ToUpper(model) + "_URL"
variable = varPrefix + "_URL"
}
service.Environment[variable] = &status.Endpoint
}
Expand Down