docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Add parent when needed on store.Create, fix the mountpoint on store.layer.

Browse Source 
Upstream-commit: 2664668388bd2b1d7012b863d4f8d426fda17daf
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-03-12 05:23:13 -07:00
parent b9140244d5
commit 7cb2cc835d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/fs/store.go
View File

@@ -117,6 +117,9 @@ func (store *Store) Create(layerData Archive, parent *Image, pth, comment string
Comment: comment,
store: store,
}
if parent != nil {
img.Parent = parent.Id
}
// FIXME: we shouldn't have to pass os.Stderr to AddLayer()...
// FIXME: Archive should contain compression info. For now we only support uncompressed.
_, err := store.layers.AddLayer(img.Id, layerData)
@@ -198,7 +201,7 @@ func (image *Image) layers() ([]string, error) {
var err error
currentImg := image
for currentImg != nil {
if layer := image.store.layers.Get(image.Id); layer != "" {
if layer := image.store.layers.Get(currentImg.Id); layer != "" {
list = append(list, layer)
} else {
return list, fmt.Errorf("Layer not found for image %s", image.Id)
@@ -249,7 +252,6 @@ func (image *Image) Mount(root, rw string) (*Mountpoint, error) {
if err != nil {
return nil, err
}
for _, layer := range layers {
roBranches += fmt.Sprintf("%v=ro:", layer)
}