mirror of
https://github.com/containers/skopeo.git
synced 2025-09-15 14:30:58 +00:00
bump docker to 1.10.2
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
@@ -13,7 +13,7 @@ clone git github.com/gorilla/context master
|
|||||||
clone git golang.org/x/net master https://github.com/golang/net.git
|
clone git golang.org/x/net master https://github.com/golang/net.git
|
||||||
clone git github.com/go-check/check v1
|
clone git github.com/go-check/check v1
|
||||||
|
|
||||||
clone git github.com/docker/docker v1.10.1
|
clone git github.com/docker/docker v1.10.2
|
||||||
clone git github.com/docker/engine-api v0.2.3
|
clone git github.com/docker/engine-api v0.2.3
|
||||||
clone git github.com/docker/distribution 0f2d99b13ae0cfbcf118eff103e6e680b726b47e
|
clone git github.com/docker/distribution 0f2d99b13ae0cfbcf118eff103e6e680b726b47e
|
||||||
|
|
||||||
|
3
vendor/github.com/docker/docker/layer/layer_store.go
generated
vendored
3
vendor/github.com/docker/docker/layer/layer_store.go
generated
vendored
@@ -498,18 +498,21 @@ func (ls *layerStore) ReleaseRWLayer(l RWLayer) ([]Metadata, error) {
|
|||||||
|
|
||||||
if err := ls.driver.Remove(m.mountID); err != nil {
|
if err := ls.driver.Remove(m.mountID); err != nil {
|
||||||
logrus.Errorf("Error removing mounted layer %s: %s", m.name, err)
|
logrus.Errorf("Error removing mounted layer %s: %s", m.name, err)
|
||||||
|
m.retakeReference(l)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if m.initID != "" {
|
if m.initID != "" {
|
||||||
if err := ls.driver.Remove(m.initID); err != nil {
|
if err := ls.driver.Remove(m.initID); err != nil {
|
||||||
logrus.Errorf("Error removing init layer %s: %s", m.name, err)
|
logrus.Errorf("Error removing init layer %s: %s", m.name, err)
|
||||||
|
m.retakeReference(l)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := ls.store.RemoveMount(m.name); err != nil {
|
if err := ls.store.RemoveMount(m.name); err != nil {
|
||||||
logrus.Errorf("Error removing mount metadata: %s: %s", m.name, err)
|
logrus.Errorf("Error removing mount metadata: %s: %s", m.name, err)
|
||||||
|
m.retakeReference(l)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
1
vendor/github.com/docker/docker/layer/migration.go
generated
vendored
1
vendor/github.com/docker/docker/layer/migration.go
generated
vendored
@@ -127,6 +127,7 @@ func (ls *layerStore) checksumForGraphIDNoTarsplit(id, parent, newTarDataPath st
|
|||||||
}
|
}
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
mfz := gzip.NewWriter(f)
|
mfz := gzip.NewWriter(f)
|
||||||
|
defer mfz.Close()
|
||||||
metaPacker := storage.NewJSONPacker(mfz)
|
metaPacker := storage.NewJSONPacker(mfz)
|
||||||
|
|
||||||
packerCounter := &packSizeCounter{metaPacker, &size}
|
packerCounter := &packSizeCounter{metaPacker, &size}
|
||||||
|
7
vendor/github.com/docker/docker/layer/mounted_layer.go
generated
vendored
7
vendor/github.com/docker/docker/layer/mounted_layer.go
generated
vendored
@@ -96,6 +96,13 @@ func (ml *mountedLayer) deleteReference(ref RWLayer) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ml *mountedLayer) retakeReference(r RWLayer) {
|
||||||
|
if ref, ok := r.(*referencedRWLayer); ok {
|
||||||
|
ref.activityCount = 0
|
||||||
|
ml.references[ref] = ref
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type referencedRWLayer struct {
|
type referencedRWLayer struct {
|
||||||
*mountedLayer
|
*mountedLayer
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user