From f538ebbe4a373be8516de0dd7f9aae10af8ab394 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 14 Feb 2024 12:25:50 +0100 Subject: [PATCH] [release-1.51] overlay: ignore idtools.MkdirAllAs(diffDir) errors ignore errors creating and chowning the diffDiff if it is in an additional image store. Signed-off-by: Giuseppe Scrivano --- drivers/overlay/overlay.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go index 3891a81f45..8b3bbf4ca3 100644 --- a/drivers/overlay/overlay.go +++ b/drivers/overlay/overlay.go @@ -1670,7 +1670,13 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO } if err := idtools.MkdirAllAs(diffDir, perms, rootUID, rootGID); err != nil { - return "", err + if !inAdditionalStore { + return "", err + } + // if it is in an additional store, do not fail if the directory already exists + if _, err2 := os.Stat(diffDir); err2 != nil { + return "", err + } } mergedDir := path.Join(workDirBase, "merged")