From 17f09f5a4d65cdd9f4dd5d5843ed9f282172cdc4 Mon Sep 17 00:00:00 2001 From: Jonathan Choy Date: Thu, 17 May 2018 21:52:03 -0400 Subject: [PATCH 1/2] Rewrote data-root escape error message Signed-off-by: Jonathan Choy Upstream-commit: 1845cd0d86f0c85115bbf7cdc806c114096751a9 Component: engine --- components/engine/volume/local/local.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/volume/local/local.go b/components/engine/volume/local/local.go index 226a5dd4fb..78a3ec8288 100644 --- a/components/engine/volume/local/local.go +++ b/components/engine/volume/local/local.go @@ -211,7 +211,7 @@ func (r *Root) Remove(v volume.Volume) error { } if !r.scopedPath(realPath) { - return errdefs.System(errors.Errorf("Unable to remove a directory of out the Docker root %s: %s", r.scope, realPath)) + return errdefs.System(errors.Errorf("Unable to remove a directory outside of the Docker root %s: %s", r.scope, realPath)) } if err := removePath(realPath); err != nil { From a57d540856dc2b041e4a1351d459f7068b73a17a Mon Sep 17 00:00:00 2001 From: Jonathan Choy Date: Fri, 18 May 2018 11:09:35 -0400 Subject: [PATCH 2/2] Amended per cleanup request. Signed-off-by: Jonathan Choy Upstream-commit: e4186ba7087b61e1d770fa087cd46729bbfda32e Component: engine --- components/engine/volume/local/local.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/volume/local/local.go b/components/engine/volume/local/local.go index 78a3ec8288..b1eb2881b4 100644 --- a/components/engine/volume/local/local.go +++ b/components/engine/volume/local/local.go @@ -211,7 +211,7 @@ func (r *Root) Remove(v volume.Volume) error { } if !r.scopedPath(realPath) { - return errdefs.System(errors.Errorf("Unable to remove a directory outside of the Docker root %s: %s", r.scope, realPath)) + return errdefs.System(errors.Errorf("Unable to remove a directory outside of the local volume root %s: %s", r.scope, realPath)) } if err := removePath(realPath); err != nil {