From d07549fe224de92909dc52d38b5f345c54f38f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=89=B3=E7=BA=A200139573?= Date: Wed, 22 Nov 2017 15:10:31 +0800 Subject: [PATCH 1/5] modify log in order to be same below MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄艳红00139573 Signed-off-by: huangyanhong Upstream-commit: fe8bcb1a8e5ab0426822d512df97eebed268dfc4 Component: engine --- components/engine/volume/store/store.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/volume/store/store.go b/components/engine/volume/store/store.go index fd1ca616ca..9a511a5df5 100644 --- a/components/engine/volume/store/store.go +++ b/components/engine/volume/store/store.go @@ -145,8 +145,9 @@ func (s *VolumeStore) Purge(name string) { s.globalLock.Lock() v, exists := s.names[name] if exists { - if _, err := volumedrivers.ReleaseDriver(v.DriverName()); err != nil { - logrus.Errorf("Error dereferencing volume driver: %v", err) + driverName := v.DriverName() + if _, err := volumedrivers.ReleaseDriver(driverName); err != nil { + logrus.WithError(err).WithField("driver", driverName).Error("Error releasing reference to volume driver") } } if err := s.removeMeta(name); err != nil { From 1be15401b496ca345a638441705e4cb6f60ca8e8 Mon Sep 17 00:00:00 2001 From: Boaz Shuster Date: Wed, 6 Dec 2017 16:45:33 +0200 Subject: [PATCH 2/5] Add a debug message when client closes websocket attach connection When the client closes websocket connections that sends container output through websocket, an error message is displayed: "Error attaching websocket: %!s()" This message is misleading. Thus, this change suggests to check if error is nil and print the correct message accordingly. Signed-off-by: Boaz Shuster Upstream-commit: 8f65bb6d90e3a95420bb634e415c3cce36d86201 Component: engine --- .../engine/api/server/router/container/container_routes.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/engine/api/server/router/container/container_routes.go b/components/engine/api/server/router/container/container_routes.go index d845fdd00f..b7848a3c94 100644 --- a/components/engine/api/server/router/container/container_routes.go +++ b/components/engine/api/server/router/container/container_routes.go @@ -593,7 +593,11 @@ func (s *containerRouter) wsContainersAttach(ctx context.Context, w http.Respons close(done) select { case <-started: - logrus.Errorf("Error attaching websocket: %s", err) + if err != nil { + logrus.Errorf("Error attaching websocket: %s", err) + } else { + logrus.Debug("websocket connection was closed by client") + } return nil default: } From 9b7822f4af36710dccb1f734b5bb01f890176d06 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 6 Dec 2017 15:02:10 -0800 Subject: [PATCH 3/5] Update API version-history for 1.35 Signed-off-by: Sebastiaan van Stijn Upstream-commit: 8a9d926b553345be530ddc51374c9817fcbea784 Component: engine --- components/engine/docs/api/version-history.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/components/engine/docs/api/version-history.md b/components/engine/docs/api/version-history.md index 5056c0ddba..2ed2ae5d57 100644 --- a/components/engine/docs/api/version-history.md +++ b/components/engine/docs/api/version-history.md @@ -23,6 +23,18 @@ keywords: "API, Docker, rcli, REST, documentation" configuration is only used for Windows containers. * `GET /containers/(name)/logs` now supports an additional query parameter: `until`, which returns log lines that occurred before the specified timestamp. +* `POST /containers/{id}/exec` now accepts a `WorkingDir` property to set the + work-dir for the exec process, independent of the container's work-dir. +* `Get /version` now returns a `Platform.Name` field, which can be used by products + using Moby as a foundation to return information about the platform. +* `Get /version` now returns a `Components` field, which can be used to return + information about the components used. Information about the engine itself is + now included as a "Component" version, and contains all information from the + top-level `Version`, `GitCommit`, `APIVersion`, `MinAPIVersion`, `GoVersion`, + `Os`, `Arch`, `BuildTime`, `KernelVersion`, and `Experimental` fields. Going + forward, the information from the `Components` section is preferred over their + top-level counterparts. + ## v1.34 API changes From 090ce73a5d54307e215187a4200e949caf404062 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Sat, 2 Dec 2017 16:01:50 +1100 Subject: [PATCH 4/5] Changed go vendor from moby/moby to docker/docker in dev docs. If there is a package-rename forthcoming, it isn't currently evident on master, but seems to show in doc. Changed doc to show actual docker/docker paths as they occur now instead of moby/moby. Signed-off-by: Brett Randall Upstream-commit: 355cf9483c1b8ede5ae3ed50add4de2a69d62645 Component: engine --- components/engine/docs/contributing/set-up-dev-env.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/docs/contributing/set-up-dev-env.md b/components/engine/docs/contributing/set-up-dev-env.md index 28bea5b86f..c2c8389a28 100644 --- a/components/engine/docs/contributing/set-up-dev-env.md +++ b/components/engine/docs/contributing/set-up-dev-env.md @@ -129,13 +129,14 @@ can take over 15 minutes to complete. ```none Successfully built 3d872560918e + Successfully tagged docker-dev:dry-run-test docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_INCREMENTAL_BINARY -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/moby/moby/bundles" -t "docker-dev:dry-run-test" bash root@f31fa223770f:/go/src/github.com/docker/docker# ``` At this point, your prompt reflects the container's BASH shell. -5. List the contents of the current directory (`/go/src/github.com/moby/moby`). +5. List the contents of the current directory (`/go/src/github.com/docker/docker`). You should see the image's source from the `/go/src/github.com/docker/docker` directory. From 43ace3ab68a68df930a326715cecd09165d5c1f0 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 7 Dec 2017 08:41:20 -0800 Subject: [PATCH 5/5] Update mlaventure email Signed-off-by: Kenfe-Mickael Laventure Upstream-commit: 2ba8ce708727578752d9838d9c4db945cd008792 Component: engine --- components/engine/MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/engine/MAINTAINERS b/components/engine/MAINTAINERS index d81caba80a..a8966873b4 100644 --- a/components/engine/MAINTAINERS +++ b/components/engine/MAINTAINERS @@ -368,7 +368,7 @@ [people.mlaventure] Name = "Kenfe-Mickaël Laventure" - Email = "mickael.laventure@docker.com" + Email = "mickael.laventure@gmail.com" GitHub = "mlaventure" [people.moxiegirl] @@ -465,4 +465,3 @@ Name = "Yong Tang" Email = "yong.tang.github@outlook.com" GitHub = "yongtang" -