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

1 files changed, 5 insertions, 6 deletions

diff --git a/daemon/container_windows.go b/daemon/container_windows.go
index 7d885c3c3d..892418252f 100644
--- a/daemon/container_windows.go
+++ b/daemon/container_windows.go
@@ -5,7 +5,6 @@ package daemon
 import (
 	"strings"
 
-	"github.com/docker/docker/context"
 	"github.com/docker/docker/daemon/execdriver"
 	derr "github.com/docker/docker/errors"
 )
@@ -26,7 +25,7 @@ func killProcessDirectly(container *Container) error {
 	return nil
 }
 
-func (container *Container) setupLinkedContainers(ctx context.Context) ([]string, error) {
+func (container *Container) setupLinkedContainers() ([]string, error) {
 	return nil, nil
 }
 
@@ -35,7 +34,7 @@ func (container *Container) createDaemonEnvironment(linkedEnv []string) []string
 	return container.Config.Env
 }
 
-func (container *Container) initializeNetworking(ctx context.Context) error {
+func (container *Container) initializeNetworking() error {
 	return nil
 }
 
@@ -43,7 +42,7 @@ func (container *Container) setupWorkingDirectory() error {
 	return nil
 }
 
-func populateCommand(ctx context.Context, c *Container, env []string) error {
+func populateCommand(c *Container, env []string) error {
 	en := &execdriver.Network{
 		Interface: nil,
 	}
@@ -136,7 +135,7 @@ func populateCommand(ctx context.Context, c *Container, env []string) error {
 }
 
 // GetSize returns real size & virtual size
-func (container *Container) getSize(ctx context.Context) (int64, int64) {
+func (container *Container) getSize() (int64, int64) {
 	// TODO Windows
 	return 0, 0
 }
@@ -151,7 +150,7 @@ func (container *Container) allocateNetwork() error {
 	return nil
 }
 
-func (container *Container) updateNetwork(ctx context.Context) error {
+func (container *Container) updateNetwork() error {
 	return nil
 }