dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-06-30 19:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

contenthash: fix uid/gid in contenthash

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2022-11-21 23:37:58 -08:00
parent f77133007f
commit f84058eb1f
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/contenthash/filehash.go vendored
View File

@@ -51,6 +51,8 @@ func NewFromStat(stat *fstypes.Stat) (hash.Hash, error) {
hdr.Name = "" // note: empty name is different from current has in docker build. Name is added on recursive directory scan instead
hdr.Devmajor = stat.Devmajor
hdr.Devminor = stat.Devminor
hdr.Uid = int(stat.Uid)
hdr.Gid = int(stat.Gid)
if len(stat.Xattrs) > 0 {
hdr.PAXRecords = make(map[string]string, len(stat.Xattrs))

60
client/client_test.go
View File

@@ -87,6 +87,7 @@ func TestIntegration(t *testing.T) {
testFileOpCopyRm,
testFileOpCopyIncludeExclude,
testFileOpRmWildcard,
testFileOpCopyUIDCache,
testCallDiskUsage,
testBuildMultiMount,
testBuildHTTPSource,
@@ -1436,6 +1437,65 @@ func testFileOpCopyRm(t *testing.T, sb integration.Sandbox) {
require.Equal(t, []byte("file2"), dt)
}
// moby/buildkit#3291
func testFileOpCopyUIDCache(t *testing.T, sb integration.Sandbox) {
requiresLinux(t)
c, err := New(sb.Context(), sb.Address())
require.NoError(t, err)
defer c.Close()
st := llb.Scratch().File(
llb.Copy(llb.Image("alpine").Run(llb.Shlex(`sh -c 'echo 123 > /foo && chown 1000:1000 /foo'`)).Root(), "foo", "foo"))
def, err := st.Marshal(sb.Context())
require.NoError(t, err)
var buf bytes.Buffer
_, err = c.Solve(sb.Context(), def, SolveOpt{
Exports: []ExportEntry{
{
Type: ExporterTar,
Output: fixedWriteCloser(&nopWriteCloser{&buf}),
},
},
}, nil)
require.NoError(t, err)
m, err := testutil.ReadTarToMap(buf.Bytes(), false)
require.NoError(t, err)
fi, ok := m["foo"]
require.True(t, ok)
require.Equal(t, 1000, fi.Header.Uid)
require.Equal(t, 1000, fi.Header.Gid)
// repeat to check cache does not apply for different uid
st = llb.Scratch().File(
llb.Copy(llb.Image("alpine").Run(llb.Shlex(`sh -c 'echo 123 > /foo'`)).Root(), "foo", "foo"))
def, err = st.Marshal(sb.Context())
require.NoError(t, err)
buf = bytes.Buffer{}
_, err = c.Solve(sb.Context(), def, SolveOpt{
Exports: []ExportEntry{
{
Type: ExporterTar,
Output: fixedWriteCloser(&nopWriteCloser{&buf}),
},
},
}, nil)
require.NoError(t, err)
m, err = testutil.ReadTarToMap(buf.Bytes(), false)
require.NoError(t, err)
fi, ok = m["foo"]
require.True(t, ok)
require.Equal(t, 0, fi.Header.Uid)
require.Equal(t, 0, fi.Header.Gid)
}
func testFileOpCopyIncludeExclude(t *testing.T, sb integration.Sandbox) {
requiresLinux(t)
c, err := New(sb.Context(), sb.Address())