0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #44016 from thaJeztah/dont_set_ignoreImagesArgsEscaped

Browse source 
daemon: don't set ignoreImagesArgsEscaped, managed where not needed
This commit is contained in:
Sebastiaan van Stijn 2022-09-27 17:59:23 +02:00 • committed by GitHub
commit 96355b4f1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
daemon/create.go
View file

@ -35,17 +35,16 @@ type createOpts struct {
// CreateManagedContainer creates a container that is managed by a Service
func (daemon *Daemon) CreateManagedContainer(params types.ContainerCreateConfig) (containertypes.CreateResponse, error) {
return daemon.containerCreate(createOpts{
params: params,
managed: true,
ignoreImagesArgsEscaped: false})
params: params,
managed: true,
})
}
// ContainerCreate creates a regular container
func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig) (containertypes.CreateResponse, error) {
return daemon.containerCreate(createOpts{
params: params,
managed: false,
ignoreImagesArgsEscaped: false})
params: params,
})
}
// ContainerCreateIgnoreImagesArgsEscaped creates a regular container. This is called from the builder RUN case
@ -53,8 +52,8 @@ func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig) (conta
func (daemon *Daemon) ContainerCreateIgnoreImagesArgsEscaped(params types.ContainerCreateConfig) (containertypes.CreateResponse, error) {
return daemon.containerCreate(createOpts{
params: params,
managed: false,
ignoreImagesArgsEscaped: true})
ignoreImagesArgsEscaped: true,
})
}
func (daemon *Daemon) containerCreate(opts createOpts) (containertypes.CreateResponse, error) {