Allow child to overwrite entrypoint from parent

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 50fa9dffcf023c81f3142f0ddd294db4ac6b8281
Component: engine
This commit is contained in:
Michael Crosby
2014-10-07 22:39:50 +00:00
parent a6ccd9b35c
commit 2d4da4a816
3 changed files with 111 additions and 6 deletions

View File

@ -302,8 +302,8 @@ func deleteAllContainers() error {
return nil
}
func deleteImages(images string) error {
rmiCmd := exec.Command(dockerBinary, "rmi", images)
func deleteImages(images ...string) error {
rmiCmd := exec.Command(dockerBinary, "rmi", strings.Join(images, " "))
exitCode, err := runCommand(rmiCmd)
// set error manually if not set
if exitCode != 0 && err == nil {