diff --git a/go.mod b/go.mod index 075827d67..b2587e3ff 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/containerd/btrfs/v2 v2.0.0 github.com/containerd/cgroups/v3 v3.0.1 github.com/containerd/console v1.0.3 - github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11 + github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081 github.com/containerd/fifo v1.1.0 github.com/containerd/go-cni v1.1.9 github.com/containerd/go-runc v1.0.0 diff --git a/go.sum b/go.sum index 890df5279..89c6fcb11 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= -github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11 h1:NKxa3JMWvOvsU7ZgHwd9CZupl/692lPy/MBcumAAHsI= -github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= +github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081 h1:1/vHscvA9Q2uXev+au1072As9m7pa9C4OaFDs6NgEBk= +github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081/go.mod h1:X1lYRPhc8/FifyvZvm13dkXxT6X+MhWvZykoSnMPyWU= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= diff --git a/integration/client/go.mod b/integration/client/go.mod index d8b4c97f4..af081c755 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -9,7 +9,7 @@ require ( github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 github.com/containerd/cgroups/v3 v3.0.1 github.com/containerd/containerd v1.7.0-beta.0 // see replace; the actual version of containerd is replaced with the code at the root of this repository - github.com/containerd/continuity v0.3.0 + github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081 github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.2.1 github.com/containerd/typeurl/v2 v2.1.0 diff --git a/integration/client/go.sum b/integration/client/go.sum index 833ed3466..38c5dbd5c 100644 --- a/integration/client/go.sum +++ b/integration/client/go.sum @@ -654,8 +654,8 @@ github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARu github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= -github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11 h1:NKxa3JMWvOvsU7ZgHwd9CZupl/692lPy/MBcumAAHsI= -github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= +github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081 h1:1/vHscvA9Q2uXev+au1072As9m7pa9C4OaFDs6NgEBk= +github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081/go.mod h1:X1lYRPhc8/FifyvZvm13dkXxT6X+MhWvZykoSnMPyWU= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= diff --git a/vendor/github.com/containerd/continuity/fs/fstest/compare_windows.go b/vendor/github.com/containerd/continuity/fs/fstest/compare_windows.go index f1f378410..0cf3dbe95 100644 --- a/vendor/github.com/containerd/continuity/fs/fstest/compare_windows.go +++ b/vendor/github.com/containerd/continuity/fs/fstest/compare_windows.go @@ -17,14 +17,21 @@ package fstest var metadataFiles = map[string]bool{ - "\\System Volume Information": true, - "\\WcSandboxState": true, - "\\Windows": true, - "\\Windows\\System32": true, - "\\Windows\\System32\\config": true, - "\\Windows\\System32\\config\\DEFAULT": true, - "\\Windows\\System32\\config\\SAM": true, - "\\Windows\\System32\\config\\SECURITY": true, - "\\Windows\\System32\\config\\SOFTWARE": true, - "\\Windows\\System32\\config\\SYSTEM": true, + "\\System Volume Information": true, + "\\WcSandboxState": true, + "\\WcSandboxState\\Hives": true, + "\\WcSandboxState\\Hives\\DefaultUser_Delta": true, + "\\WcSandboxState\\Hives\\Sam_Delta": true, + "\\WcSandboxState\\Hives\\Security_Delta": true, + "\\WcSandboxState\\Hives\\Software_Delta": true, + "\\WcSandboxState\\Hives\\System_Delta": true, + "\\WcSandboxState\\initialized": true, + "\\Windows": true, + "\\Windows\\System32": true, + "\\Windows\\System32\\config": true, + "\\Windows\\System32\\config\\DEFAULT": true, + "\\Windows\\System32\\config\\SAM": true, + "\\Windows\\System32\\config\\SECURITY": true, + "\\Windows\\System32\\config\\SOFTWARE": true, + "\\Windows\\System32\\config\\SYSTEM": true, } diff --git a/vendor/github.com/containerd/continuity/ioutils.go b/vendor/github.com/containerd/continuity/ioutils.go index 392c407fa..8b0e72013 100644 --- a/vendor/github.com/containerd/continuity/ioutils.go +++ b/vendor/github.com/containerd/continuity/ioutils.go @@ -37,26 +37,32 @@ func atomicWriteFile(filename string, r io.Reader, dataSize int64, perm os.FileM if err != nil { return err } + needClose := true + defer func() { + if needClose { + f.Close() + } + }() + err = os.Chmod(f.Name(), perm) if err != nil { - f.Close() return err } n, err := io.Copy(f, r) if err == nil && n < dataSize { - f.Close() return io.ErrShortWrite } if err != nil { - f.Close() return err } - if err := f.Sync(); err != nil { - f.Close() + if err = f.Sync(); err != nil { return err } + + needClose = false if err := f.Close(); err != nil { return err } + return os.Rename(f.Name(), filename) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9cb5ccc21..9fd9fef03 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -98,8 +98,8 @@ github.com/containerd/cgroups/v3/cgroup2/stats # github.com/containerd/console v1.0.3 ## explicit; go 1.13 github.com/containerd/console -# github.com/containerd/continuity v0.3.1-0.20230206102841-68f7b34f5e11 -## explicit; go 1.17 +# github.com/containerd/continuity v0.3.1-0.20230307035957-72c70feb3081 +## explicit; go 1.19 github.com/containerd/continuity github.com/containerd/continuity/devices github.com/containerd/continuity/driver