From ba138d6201d58b72408658f474ed2301041ca76c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 23 Aug 2022 22:05:09 +0200 Subject: [PATCH] daemon: don't set ignoreImagesArgsEscaped, managed where not needed Just a minor cleanup; I went looking where these options were used, and these occurrences set then to their default value. Removing these assignments makes it easier to find where they're actually used. Signed-off-by: Sebastiaan van Stijn --- daemon/create.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/daemon/create.go b/daemon/create.go index 4d44d01ca6..495f753feb 100644 --- a/daemon/create.go +++ b/daemon/create.go @@ -34,17 +34,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 @@ -52,8 +51,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) {