Skip to content

Commit 0b5a315

Browse files
AkihiroSudaAkihiroSuda
committed
MountStubsCleaner: preserve timestamps
Fix issue 3148 Signed-off-by: Akihiro Suda <[email protected]>
1 parent f771330 commit 0b5a315

File tree

4 files changed

+133
-1
lines changed

4 files changed

+133
-1
lines changed

‎client/client_test.go

+70
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ func TestIntegration(t *testing.T) {
183183
testSBOMScan,
184184
testSBOMScanSingleRef,
185185
testMultipleCacheExports,
186+
testMountStubsTimestamp,
186187
)
187188
}
188189

@@ -7902,6 +7903,75 @@ func testMultipleCacheExports(t *testing.T, sb integration.Sandbox) {
79027903
ensureFileContents(t, filepath.Join(destDir, "unique"), string(uniqueFile))
79037904
}
79047905

7906+
// https://github.com/moby/buildkit/issues/3148
7907+
func testMountStubsTimestamp(t *testing.T, sb integration.Sandbox) {
7908+
c, err := New(sb.Context(), sb.Address())
7909+
require.NoError(t, err)
7910+
defer c.Close()
7911+
7912+
const sourceDateEpoch = int64(1234567890) // Fri Feb 13 11:31:30 PM UTC 2009
7913+
st := llb.Image("busybox:latest").Run(
7914+
llb.Args([]string{"/bin/touch", fmt.Sprintf("--date=@%d", sourceDateEpoch),
7915+
"/bin",
7916+
"/etc",
7917+
"/var",
7918+
"/var/foo",
7919+
"/tmp",
7920+
"/tmp/foo2",
7921+
"/tmp/foo2/bar",
7922+
}),
7923+
llb.AddMount("/var/foo", llb.Scratch(), llb.Tmpfs()),
7924+
llb.AddMount("/tmp/foo2/bar", llb.Scratch(), llb.Tmpfs()),
7925+
)
7926+
def, err := st.Marshal(sb.Context())
7927+
require.NoError(t, err)
7928+
7929+
tmpDir := t.TempDir()
7930+
tarFile := filepath.Join(tmpDir, "out.tar")
7931+
tarFileW, err := os.Create(tarFile)
7932+
require.NoError(t, err)
7933+
defer tarFileW.Close()
7934+
7935+
_, err = c.Solve(sb.Context(), def, SolveOpt{
7936+
Exports: []ExportEntry{
7937+
{
7938+
Type: ExporterTar,
7939+
Output: fixedWriteCloser(tarFileW),
7940+
},
7941+
},
7942+
}, nil)
7943+
require.NoError(t, err)
7944+
tarFileW.Close()
7945+
7946+
tarFileR, err := os.Open(tarFile)
7947+
require.NoError(t, err)
7948+
defer tarFileR.Close()
7949+
tarR := tar.NewReader(tarFileR)
7950+
touched := map[string]*tar.Header{
7951+
"bin/": nil, // Regular dir
7952+
"etc/": nil, // Parent of file mounts (etc/{resolv.conf, hosts})
7953+
"var/": nil, // Parent of dir mount (var/foo/)
7954+
"tmp/": nil, // Grandparent of dir mount (tmp/foo2/bar/)
7955+
// No support for reproducing the timestamps of mount point directories such as var/foo/ and tmp/foo2/bar/,
7956+
// because the touched timestamp value is lost when the mount is unmounted.
7957+
}
7958+
for {
7959+
hd, err := tarR.Next()
7960+
if errors.Is(err, io.EOF) {
7961+
break
7962+
}
7963+
require.NoError(t, err)
7964+
if x, ok := touched[hd.Name]; ok && x == nil {
7965+
touched[hd.Name] = hd
7966+
}
7967+
}
7968+
for name, hd := range touched {
7969+
t.Logf("Verifying %q (%+v)", name, hd)
7970+
require.NotNil(t, hd, name)
7971+
require.Equal(t, sourceDateEpoch, hd.ModTime.Unix(), name)
7972+
}
7973+
}
7974+
79057975
func ensureFile(t *testing.T, path string) {
79067976
st, err := os.Stat(path)
79077977
require.NoError(t, err, "expected file at %s", path)

‎executor/stubs.go

+25-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"syscall"
88

99
"github.com/containerd/continuity/fs"
10+
"github.com/moby/buildkit/util/system"
11+
"github.com/sirupsen/logrus"
1012
)
1113

1214
func MountStubsCleaner(dir string, mounts []Mount) func() {
@@ -43,7 +45,29 @@ func MountStubsCleaner(dir string, mounts []Mount) func() {
4345
if st.Size() != 0 {
4446
continue
4547
}
46-
os.Remove(p)
48+
// Back up the timestamps of the dir for reproducible builds
49+
// https://github.com/moby/buildkit/issues/3148
50+
dir := filepath.Dir(p)
51+
dirSt, err := os.Stat(dir)
52+
if err != nil {
53+
logrus.WithError(err).Warnf("Failed to stat %q (parent of mount stub %q)", dir, p)
54+
continue
55+
}
56+
mtime := dirSt.ModTime()
57+
atime, err := system.Atime(dirSt)
58+
if err != nil {
59+
logrus.WithError(err).Warnf("Failed to stat atime of %q (parent of mount stub %q)", dir, p)
60+
atime = mtime
61+
}
62+
63+
if err := os.Remove(p); err != nil {
64+
logrus.WithError(err).Warnf("Failed to remove mount stub %q", p)
65+
}
66+
67+
// Restore the timestamps of the dir
68+
if err := os.Chtimes(dir, atime, mtime); err != nil {
69+
logrus.WithError(err).Warnf("Failed to restore time time mount stub timestamp (os.Chtimes(%q, %v, %v))", dir, atime, mtime)
70+
}
4771
}
4872
}
4973
}

‎util/system/atime_unix.go

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//go:build !windows
2+
// +build !windows
3+
4+
package system
5+
6+
import (
7+
"fmt"
8+
iofs "io/fs"
9+
"syscall"
10+
"time"
11+
12+
"github.com/containerd/continuity/fs"
13+
)
14+
15+
func Atime(st iofs.FileInfo) (time.Time, error) {
16+
stSys, ok := st.Sys().(*syscall.Stat_t)
17+
if !ok {
18+
return time.Time{}, fmt.Errorf("expected st.Sys() to be *syscall.Stat_t, got %T", st.Sys())
19+
}
20+
return fs.StatATimeAsTime(stSys), nil
21+
}

‎util/system/atime_windows.go

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package system
2+
3+
import (
4+
"fmt"
5+
iofs "io/fs"
6+
"syscall"
7+
"time"
8+
)
9+
10+
func Atime(st iofs.FileInfo) (time.Time, error) {
11+
stSys, ok := st.Sys().(*syscall.Win32FileAttributeData)
12+
if !ok {
13+
return time.Time{}, fmt.Errorf("expected st.Sys() to be *syscall.Win32FileAttributeData, got %T", st.Sys())
14+
}
15+
// ref: https://github.com/golang/go/blob/go1.19.2/src/os/types_windows.go#L230
16+
return time.Unix(0, stSys.LastAccessTime.Nanoseconds()), nil
17+
}

0 commit comments

Comments
 (0)