dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 17:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Avoid container package shadowing

Browse Source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2026-07-22 17:35:25 +02:00
parent 94c2fde5a6
commit 83d6c78ee2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon/mounts.go
View File

@@ -11,13 +11,13 @@ import (
volumesservice "github.com/moby/moby/v2/daemon/volume/service"
)
func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
container.Lock()
defer container.Unlock()
func (daemon *Daemon) prepareMountPoints(ctr *container.Container) error {
ctr.Lock()
defer ctr.Unlock()
alive := container.State.Running
for _, config := range container.MountPoints {
if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
alive := ctr.State.Running
for _, config := range ctr.MountPoints {
if err := daemon.lazyInitializeVolume(ctr.ID, config); err != nil {
return err
}
@@ -37,7 +37,7 @@ func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
}
if alive {
log.G(context.TODO()).WithFields(log.Fields{
"container": container.ID,
"container": ctr.ID,
"volume": config.Volume.Name(),
}).Debug("Live-restoring volume for alive container")
if err := config.LiveRestore(context.TODO()); err != nil {
@@ -48,15 +48,15 @@ func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
return nil
}
func (daemon *Daemon) removeMountPoints(container *container.Container, rm bool) error {
func (daemon *Daemon) removeMountPoints(ctr *container.Container, rm bool) error {
var rmErrors []string
ctx := context.TODO()
for _, m := range container.MountPoints {
for _, m := range ctr.MountPoints {
if m.Type == mounttypes.TypeVolume {
if m.Volume == nil {
continue
}
daemon.volumes.Release(ctx, m.Volume.Name(), container.ID)
daemon.volumes.Release(ctx, m.Volume.Name(), ctr.ID)
if !rm {
continue
}