p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify getEntrypointAndArgs

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5f6d27cebaec3d2e9e72579c91591aea5bcb6966
Component: engine
This commit is contained in:
Alexander Morozov
2015-10-27 09:36:08 -07:00
parent 922b28a2df
commit 33a72eeb51
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/daemon/daemon.go
View File

@ -450,21 +450,12 @@ func (daemon *Daemon) generateHostname(id string, config *runconfig.Config) {
}
func (daemon *Daemon) getEntrypointAndArgs(configEntrypoint *stringutils.StrSlice, configCmd *stringutils.StrSlice) (string, []string) {
var (
entrypoint string
args []string
)
cmdSlice := configCmd.Slice()
if configEntrypoint.Len() != 0 {
eSlice := configEntrypoint.Slice()
entrypoint = eSlice[0]
args = append(eSlice[1:], cmdSlice...)
} else {
entrypoint = cmdSlice[0]
args = cmdSlice[1:]
return eSlice[0], append(eSlice[1:], cmdSlice...)
}
return entrypoint, args
return cmdSlice[0], cmdSlice[1:]
}
func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID string) (*Container, error) {