summaryrefslogtreecommitdiff
path: root/daemon/archive.go
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@docker.com>2017-05-25 17:03:29 -0400
committerDaniel Nephin <dnephin@docker.com>2017-06-08 15:07:16 -0400
commit51360965206b0db49cc0365dabb590063a17a9df (patch)
treed2dce7781224a8a11dc2afdd07a1d0d6a3eea811 /daemon/archive.go
parentecd44d23cc3c863c20467377cf568b920e2dd89c (diff)
downloaddocker-51360965206b0db49cc0365dabb590063a17a9df.tar.gz
Fix copy when used with scratch and images with empty RootFS
Commit the rwLayer to get the correct DiffID Refacator copy in thebuilder move more code into exportImage cleanup some windows tests Release the newly commited layer. Set the imageID on the buildStage after exporting a new image. Move archiver to BuildManager. Have ReleaseableLayer.Commit return a layer and store the Image from exportImage in the local imageSources cache Remove NewChild from image interface. Signed-off-by: Daniel Nephin <dnephin@docker.com>
Diffstat (limited to 'daemon/archive.go')
-rw-r--r--daemon/archive.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/archive.go b/daemon/archive.go
index 5db1ef9826..bd00daca53 100644
--- a/daemon/archive.go
+++ b/daemon/archive.go
@@ -359,4 +359,4 @@ func (daemon *Daemon) containerCopy(container *container.Container, resource str
})
daemon.LogContainerEvent(container, "copy")
return reader, nil
-} \ No newline at end of file
+}