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 #1787 from ndeloof/remove_anonymous 

`compose down -v` also removes anonymous volumes
This commit is contained in:
Nicolas De loof 2021-06-15 15:06:46 +02:00 committed by GitHub
parent 43655ba500 7f22783d56
commit a29d3e6f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/compose/build.go
View File

@ -232,7 +232,7 @@ func (s *composeService) doBuild(ctx context.Context, project *types.Project, op
for _, c := range observedState {
for imageName := range opts {
if c.Image == imageName {
err = s.removeContainers(ctx, cw, []moby.Container{c}, nil)
err = s.removeContainers(ctx, cw, []moby.Container{c}, nil, false)
if err != nil {
return nil, err
}

2
local/compose/create.go
View File

@ -93,7 +93,7 @@ func (s *composeService) create(ctx context.Context, project *types.Project, opt
if len(orphans) > 0 {
if options.RemoveOrphans {
w := progress.ContextWriter(ctx)
err := s.removeContainers(ctx, w, orphans, nil)
err := s.removeContainers(ctx, w, orphans, nil, false)
if err != nil {
return err
}

11
local/compose/down.go
View File

@ -66,7 +66,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options c
err = InReverseDependencyOrder(ctx, options.Project, func(c context.Context, service types.ServiceConfig) error {
serviceContainers := containers.filter(isService(service.Name))
err := s.removeContainers(ctx, w, serviceContainers, options.Timeout)
err := s.removeContainers(ctx, w, serviceContainers, options.Timeout, options.Volumes)
return err
})
if err != nil {
@ -75,7 +75,7 @@ func (s *composeService) down(ctx context.Context, projectName string, options c
orphans := containers.filter(isNotService(options.Project.ServiceNames()...))
if options.RemoveOrphans && len(orphans) > 0 {
err := s.removeContainers(ctx, w, orphans, options.Timeout)
err := s.removeContainers(ctx, w, orphans, options.Timeout, false)
if err != nil {
return err
}
@ -215,7 +215,7 @@ func (s *composeService) stopContainers(ctx context.Context, w progress.Writer,
return eg.Wait()
}
func (s *composeService) removeContainers(ctx context.Context, w progress.Writer, containers []moby.Container, timeout *time.Duration) error {
func (s *composeService) removeContainers(ctx context.Context, w progress.Writer, containers []moby.Container, timeout *time.Duration, volumes bool) error {
eg, _ := errgroup.WithContext(ctx)
for _, container := range containers {
toDelete := container
@ -228,7 +228,10 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
return err
}
w.Event(progress.RemovingEvent(eventName))
err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{Force: true})
err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{
Force: true,
RemoveVolumes: volumes,
})
if err != nil {
w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
return err

2
local/compose/down_test.go
View File

@ -90,7 +90,7 @@ func TestDownRemoveVolumes(t *testing.T) {
[]apitypes.Container{testContainer("service1", "123")}, nil)
api.EXPECT().ContainerStop(gomock.Any(), "123", nil).Return(nil)
api.EXPECT().ContainerRemove(gomock.Any(), "123", apitypes.ContainerRemoveOptions{Force: true}).Return(nil)
api.EXPECT().ContainerRemove(gomock.Any(), "123", apitypes.ContainerRemoveOptions{Force: true, RemoveVolumes: true}).Return(nil)
api.EXPECT().NetworkList(gomock.Any(), apitypes.NetworkListOptions{Filters: filters.NewArgs(projectFilter(testProject))}).Return(nil, nil)