dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 06:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33292 from keloyang/attach-restart-check

Browse Source 
Add a restarting check to ContainerAttach
This commit is contained in:
Aaron Lehmann
2017-05-24 18:30:05 -07:00
committed by GitHub
parent c22ad736aa 5010e09534
commit da3c3ec145
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/attach.go
View File

@@ -31,7 +31,11 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerA
return err
}
if container.IsPaused() {
err := fmt.Errorf("Container %s is paused. Unpause the container before attach", prefixOrName)
err := fmt.Errorf("Container %s is paused, unpause the container before attach.", prefixOrName)
return errors.NewRequestConflictError(err)
}
if container.IsRestarting() {
err := fmt.Errorf("Container %s is restarting, wait until the container is running.", prefixOrName)
return errors.NewRequestConflictError(err)
}