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 #10399 from ndeloof/watch_rebuild 

watch involves up --build after change has been detected
This commit is contained in:
Milas Bowman 2023-03-24 09:10:56 -04:00 committed by GitHub
parent 925bc6fbf3 d637cc3ade
commit fd28ab8d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/compose/watch.go
View File

@ -255,6 +255,10 @@ func loadDevelopmentConfig(service types.ServiceConfig, project *types.Project)
} }
func (s *composeService) makeRebuildFn(ctx context.Context, project *types.Project) func(services rebuildServices) { func (s *composeService) makeRebuildFn(ctx context.Context, project *types.Project) func(services rebuildServices) {
for i, service := range project.Services {
service.PullPolicy = types.PullPolicyBuild
project.Services[i] = service
}
return func(services rebuildServices) { return func(services rebuildServices) {
serviceNames := make([]string, 0, len(services)) serviceNames := make([]string, 0, len(services))
allPaths := make(utils.Set[string]) allPaths := make(utils.Set[string])
@ -271,20 +275,7 @@ func (s *composeService) makeRebuildFn(ctx context.Context, project *types.Proje
strings.Join(serviceNames, ", "), strings.Join(serviceNames, ", "),
strings.Join(append([]string{""}, allPaths.Elements()...), "\n - "), strings.Join(append([]string{""}, allPaths.Elements()...), "\n - "),
) )
imageIds, err := s.build(ctx, project, api.BuildOptions{ err := s.Up(ctx, project, api.UpOptions{
Services: serviceNames,
})
if err != nil {
fmt.Fprintf(s.stderr(), "Build failed\n")
}
for i, service := range project.Services {
if id, ok := imageIds[service.Name]; ok {
service.Image = id
}
project.Services[i] = service
}
err = s.Up(ctx, project, api.UpOptions{
Create: api.CreateOptions{ Create: api.CreateOptions{
Services: serviceNames, Services: serviceNames,
Inherit: true, Inherit: true,