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

use project instead of DownOptions.project to list service images in pkg.compose.down 

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
This commit is contained in:
Guillaume Lours 2022-04-04 22:11:06 +02:00 committed by Nicolas De loof
parent d871cb98e5
commit 7fea9f7e8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/compose/down.go
View File

@ -82,7 +82,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options a
ops := s.ensureNetworksDown(ctx, project, w) ops := s.ensureNetworksDown(ctx, project, w)
if options.Images != "" { if options.Images != "" {
ops = append(ops, s.ensureImagesDown(ctx, projectName, options, w)...) ops = append(ops, s.ensureImagesDown(ctx, project, options, w)...)
} }
if options.Volumes { if options.Volumes {
@ -114,9 +114,9 @@ func (s *composeService) ensureVolumesDown(ctx context.Context, project *types.P
return ops return ops
} }
func (s *composeService) ensureImagesDown(ctx context.Context, projectName string, options api.DownOptions, w progress.Writer) []downOp { func (s *composeService) ensureImagesDown(ctx context.Context, project *types.Project, options api.DownOptions, w progress.Writer) []downOp {
var ops []downOp var ops []downOp
for image := range s.getServiceImages(options, projectName) { for image := range s.getServiceImages(options, project) {
image := image image := image
ops = append(ops, func() error { ops = append(ops, func() error {
return s.removeImage(ctx, image, w) return s.removeImage(ctx, image, w)
@ -144,15 +144,15 @@ func (s *composeService) ensureNetworksDown(ctx context.Context, project *types.
return ops return ops
} }
func (s *composeService) getServiceImages(options api.DownOptions, projectName string) map[string]struct{} { func (s *composeService) getServiceImages(options api.DownOptions, project *types.Project) map[string]struct{} {
images := map[string]struct{}{} images := map[string]struct{}{}
for _, service := range options.Project.Services { for _, service := range project.Services {
image := service.Image image := service.Image
if options.Images == "local" && image != "" { if options.Images == "local" && image != "" {
continue continue
} }
if image == "" { if image == "" {
image = getImageName(service, projectName) image = getImageName(service, project.Name)
} }
images[image] = struct{}{} images[image] = struct{}{}
} }