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 #341 from docker/better_error_message 

Better error message when trying to remove a container from a compose application
This commit is contained in:
Guillaume Tardif 2020-07-03 16:03:22 +02:00 committed by GitHub
parent aeb446ef4f dbc109808d
commit f2ff8ab669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
azure/backend.go
View File

@ -267,7 +267,8 @@ func (cs *aciContainerService) Logs(ctx context.Context, containerName string, r
func (cs *aciContainerService) Delete(ctx context.Context, containerID string, _ bool) error {
groupName, containerName := getGroupAndContainerName(containerID)
if groupName != containerID {
return errors.New(fmt.Sprintf("cannot delete service %q from compose app %q, you must delete the entire compose app with docker compose down", containerName, groupName))
msg := "cannot delete service %q from compose application %q, you can delete the entire compose app with docker compose down --project-name %s"
return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName))
}
cg, err := deleteACIContainerGroup(ctx, cs.ctx, groupName)
if err != nil {

2
azure/backend_test.go
View File

@ -50,7 +50,7 @@ func (suite *BackendSuiteTest) TestErrorMessageDeletingContainerFromComposeAppli
err := service.Delete(context.TODO(), "compose-app_service1", false)
Expect(err).NotTo(BeNil())
Expect(err.Error()).To(Equal("cannot delete service \"service1\" from compose app \"compose-app\", you must delete the entire compose app with docker compose down"))
Expect(err.Error()).To(Equal("cannot delete service \"service1\" from compose application \"compose-app\", you can delete the entire compose app with docker compose down --project-name compose-app"))
}
func (suite *BackendSuiteTest) TestErrorMessageRunSingleContainerNameWithComposeSeparator() {