diff --git a/builder/dockerfile/copy.go b/builder/dockerfile/copy.go index 2c08b69367..d0a8cea448 100644 --- a/builder/dockerfile/copy.go +++ b/builder/dockerfile/copy.go @@ -559,7 +559,10 @@ func copyFile(archiver Archiver, source, dest *copyEndpoint, identity *idtools.I // Normal containers if identity == nil { // Use system.MkdirAll here, which is a custom version of os.MkdirAll - // modified for use on Windows to handle volume GUID paths (\\?\{dae8d3ac-b9a1-11e9-88eb-e8554b2ba1db}\path\) + // modified for use on Windows to handle volume GUID paths. These paths + // are of the form \\?\Volume{}\. An example would be: + // \\?\Volume{dae8d3ac-b9a1-11e9-88eb-e8554b2ba1db}\bin\busybox.exe + if err := system.MkdirAll(filepath.Dir(dest.path), 0755, ""); err != nil { return err } diff --git a/integration/build/build_test.go b/integration/build/build_test.go index e5f17fe4ad..26c1380892 100644 --- a/integration/build/build_test.go +++ b/integration/build/build_test.go @@ -170,7 +170,6 @@ func TestBuildMultiStageCopy(t *testing.T) { assert.NilError(t, err) out := bytes.NewBuffer(nil) - assert.NilError(t, err) _, err = io.Copy(out, resp.Body) _ = resp.Body.Close() if err != nil { @@ -604,7 +603,6 @@ func TestBuildPreserveOwnership(t *testing.T) { assert.NilError(t, err) out := bytes.NewBuffer(nil) - assert.NilError(t, err) _, err = io.Copy(out, resp.Body) _ = resp.Body.Close() if err != nil {