diff options
| author | Tibor Vass <tibor@docker.com> | 2015-09-29 13:51:40 -0400 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2015-09-29 14:26:51 -0400 |
| commit | b08f071e18043abe8ce15f56826d38dd26bedb78 (patch) | |
| tree | 8d81b2c563024040d0165381cf29725bb7336ab4 /daemon/inspect_windows.go | |
| parent | 79c31f4b13d331d4011b2975a96dcdeab2036865 (diff) | |
| download | docker-b08f071e18043abe8ce15f56826d38dd26bedb78.tar.gz | |
Revert "Merge pull request #16228 from duglin/ContextualizeEvents"
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.
Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).
This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing
changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967.
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
api/server/container.go
builder/internals.go
daemon/container_unix.go
daemon/create.go
Diffstat (limited to 'daemon/inspect_windows.go')
| -rw-r--r-- | daemon/inspect_windows.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/daemon/inspect_windows.go b/daemon/inspect_windows.go index 9d48133049..34dceca609 100644 --- a/daemon/inspect_windows.go +++ b/daemon/inspect_windows.go @@ -1,9 +1,6 @@ package daemon -import ( - "github.com/docker/docker/api/types" - "github.com/docker/docker/context" -) +import "github.com/docker/docker/api/types" // This sets platform-specific fields func setPlatformSpecificContainerFields(container *Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase { @@ -15,6 +12,6 @@ func addMountPoints(container *Container) []types.MountPoint { } // ContainerInspectPre120 get containers for pre 1.20 APIs. -func (daemon *Daemon) ContainerInspectPre120(ctx context.Context, name string) (*types.ContainerJSON, error) { - return daemon.ContainerInspect(ctx, name) +func (daemon *Daemon) ContainerInspectPre120(name string) (*types.ContainerJSON, error) { + return daemon.ContainerInspect(name) } |