MountStubsCleaner: preserve timestamps

Fix issue 3148 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
moby · Oct 4, 2022 · 6abd4e1 · 6abd4e1
1 parent 092e977
commit 6abd4e1
Show file tree

Hide file tree

Showing 19 changed files with 359 additions and 1 deletion.
diff --git a/executor/stubs.go b/executor/stubs.go
@@ -7,6 +7,8 @@ import (
 	"syscall"
 
 	"github.com/containerd/continuity/fs"
+	"github.com/djherbis/atime"
+	"github.com/sirupsen/logrus"
 )
 
 func MountStubsCleaner(dir string, mounts []Mount) func() {
@@ -43,7 +45,26 @@ func MountStubsCleaner(dir string, mounts []Mount) func() {
 			if st.Size() != 0 {
 				continue
 			}
-			os.Remove(p)
+			// Back up the timestamps of the dir for reproducible builds
+			// https://github.com/moby/buildkit/issues/3148
+			dir := filepath.Dir(p)
+			dirSt, err := os.Stat(dir)
+			if err != nil {
+				logrus.WithError(err).Warnf("Failed to stat %q (parent of %q)", dir, p)
+				continue
+			}
+			atime := atime.Get(dirSt)
+			mtime := dirSt.ModTime()
+
+			if err := os.RemoveAll(p); err != nil {
+				logrus.WithError(err).Warnf("Failed to remove %q", p)
+				continue
+			}
+
+			// Revert the timestamps of the dir
+			if err := os.Chtimes(dir, atime, mtime); err != nil {
+				logrus.WithError(err).Warnf("Failed to os.Chtimes(%q, %v, %v)", dir, atime, mtime)
+			}
 		}
 	}
 }
diff --git a/go.mod b/go.mod
@@ -24,6 +24,7 @@ require (
 	github.com/containerd/stargz-snapshotter/estargz v0.12.0
 	github.com/containerd/typeurl v1.0.2
 	github.com/coreos/go-systemd/v22 v22.3.2
+	github.com/djherbis/atime v1.1.0
 	github.com/docker/cli v20.10.17+incompatible
 	github.com/docker/distribution v2.8.1+incompatible
 	github.com/docker/docker v20.10.17+incompatible // v22.06.x - see "replace" for the actual version

diff --git a/go.sum b/go.sum
@@ -485,6 +485,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
+github.com/djherbis/atime v1.1.0 h1:rgwVbP/5by8BvvjBNrbh64Qz33idKT3pSnMSJsxhi0g=
+github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
 github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=

diff --git a/vendor/github.com/djherbis/atime/.travis.yml b/vendor/github.com/djherbis/atime/.travis.yml
diff --git a/vendor/github.com/djherbis/atime/LICENSE b/vendor/github.com/djherbis/atime/LICENSE
diff --git a/vendor/github.com/djherbis/atime/README.md b/vendor/github.com/djherbis/atime/README.md
diff --git a/vendor/github.com/djherbis/atime/atime_darwin.go b/vendor/github.com/djherbis/atime/atime_darwin.go
diff --git a/vendor/github.com/djherbis/atime/atime_dragonfly.go b/vendor/github.com/djherbis/atime/atime_dragonfly.go
diff --git a/vendor/github.com/djherbis/atime/atime_freebsd.go b/vendor/github.com/djherbis/atime/atime_freebsd.go
diff --git a/vendor/github.com/djherbis/atime/atime_linux.go b/vendor/github.com/djherbis/atime/atime_linux.go
diff --git a/vendor/github.com/djherbis/atime/atime_nacl.go b/vendor/github.com/djherbis/atime/atime_nacl.go
diff --git a/vendor/github.com/djherbis/atime/atime_netbsd.go b/vendor/github.com/djherbis/atime/atime_netbsd.go
diff --git a/vendor/github.com/djherbis/atime/atime_openbsd.go b/vendor/github.com/djherbis/atime/atime_openbsd.go
diff --git a/vendor/github.com/djherbis/atime/atime_plan9.go b/vendor/github.com/djherbis/atime/atime_plan9.go
diff --git a/vendor/github.com/djherbis/atime/atime_solaris.go b/vendor/github.com/djherbis/atime/atime_solaris.go
diff --git a/vendor/github.com/djherbis/atime/atime_wasm.go b/vendor/github.com/djherbis/atime/atime_wasm.go
diff --git a/vendor/github.com/djherbis/atime/atime_windows.go b/vendor/github.com/djherbis/atime/atime_windows.go
diff --git a/vendor/github.com/djherbis/atime/stat.go b/vendor/github.com/djherbis/atime/stat.go