Simplify getEntrypointAndArgs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
parent
b6fa541877
commit
5f6d27ceba
|
@ -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) {
|
func (daemon *Daemon) getEntrypointAndArgs(configEntrypoint *stringutils.StrSlice, configCmd *stringutils.StrSlice) (string, []string) {
|
||||||
var (
|
|
||||||
entrypoint string
|
|
||||||
args []string
|
|
||||||
)
|
|
||||||
|
|
||||||
cmdSlice := configCmd.Slice()
|
cmdSlice := configCmd.Slice()
|
||||||
if configEntrypoint.Len() != 0 {
|
if configEntrypoint.Len() != 0 {
|
||||||
eSlice := configEntrypoint.Slice()
|
eSlice := configEntrypoint.Slice()
|
||||||
entrypoint = eSlice[0]
|
return eSlice[0], append(eSlice[1:], cmdSlice...)
|
||||||
args = append(eSlice[1:], cmdSlice...)
|
|
||||||
} else {
|
|
||||||
entrypoint = cmdSlice[0]
|
|
||||||
args = cmdSlice[1:]
|
|
||||||
}
|
}
|
||||||
return entrypoint, args
|
return cmdSlice[0], cmdSlice[1:]
|
||||||
}
|
}
|
||||||
|
|
||||||
func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID string) (*Container, error) {
|
func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID string) (*Container, error) {
|
||||||
|
|
Loading…
Reference in New Issue