github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

build: Make list of mounts deterministic

Browse Source 
Sort the list of mount points by destination. This makes the list
deterministic for reproducible builds and also ensures that, e.g.,
the mount for /dev happens before the mount for /dev/pts.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2018-12-28 19:51:58 +00:00
parent 2fec949cd9
commit 78281af751
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cmd/linuxkit/moby/config.go
View File

@ -2,8 +2,6 @@ package moby
import (
"fmt"
"os"
"path/filepath"
"sort"
"strconv"
"strings"
@ -416,22 +414,6 @@ func defaultMountpoint(tp string) string {
}
}
// Sort mounts by number of path components so /dev/pts is listed after /dev
type mlist []specs.Mount
func (m mlist) Len() int {
return len(m)
}
func (m mlist) Less(i, j int) bool {
return m.parts(i) < m.parts(j)
}
func (m mlist) Swap(i, j int) {
m[i], m[j] = m[j], m[i]
}
func (m mlist) parts(i int) int {
return strings.Count(filepath.Clean(m[i].Destination), string(os.PathSeparator))
}
// assignBool does ordered overrides from JSON bool pointers
func assignBool(v1, v2 *bool) bool {
if v2 != nil {
@ -821,11 +803,15 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin
}
mounts[dest] = specs.Mount{Destination: dest, Type: tp, Source: src, Options: opts}
}
mountList := mlist{}
// Create a list of mounts and sort them by destination. This makes the order deterministic and
// ensures that, e.g., the mount for /dev comes before the mount for /dev/pts
var mountList []specs.Mount
for _, m := range mounts {
mountList = append(mountList, m)
}
sort.Sort(mountList)
sort.Slice(mountList, func(i, j int) bool {
return mountList[i].Destination < mountList[j].Destination
})
namespaces := []specs.LinuxNamespace{}