mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(server): Always include 'cacert' & 'iana-etc'

Browse source 
These two packages almost always end up being required by programs,
but people don't necessarily consider them.

They will now always be added and their popularity is artificially
inflated to ensure they end up at the top of the layer list.
This commit is contained in:
Vincent Ambo 2019-10-03 22:13:40 +01:00 committed by Vincent Ambo
parent 9bb6d0ae25
commit d9b329ef59
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/nixery/server/builder/builder.go
View file

@ -87,7 +87,7 @@ type BuildResult struct {
// be used to invoke Nix. // be used to invoke Nix.
// //
// It will expand convenience names under the hood (see the `convenienceNames` // It will expand convenience names under the hood (see the `convenienceNames`
// function below). // function below) and append packages that are always included (cacert, iana-etc).
// //
// Once assembled the image structure uses a sorted representation of // Once assembled the image structure uses a sorted representation of
// the name. This is to avoid unnecessarily cache-busting images if // the name. This is to avoid unnecessarily cache-busting images if
@ -95,6 +95,7 @@ type BuildResult struct {
func ImageFromName(name string, tag string) Image { func ImageFromName(name string, tag string) Image {
pkgs := strings.Split(name, "/") pkgs := strings.Split(name, "/")
expanded := convenienceNames(pkgs) expanded := convenienceNames(pkgs)
expanded = append(expanded, "cacert", "iana-etc")
sort.Strings(pkgs) sort.Strings(pkgs)
sort.Strings(expanded) sort.Strings(expanded)
@ -131,7 +132,7 @@ type ImageResult struct {
// //
// * `shell`: Includes bash, coreutils and other common command-line tools // * `shell`: Includes bash, coreutils and other common command-line tools
func convenienceNames(packages []string) []string { func convenienceNames(packages []string) []string {
shellPackages := []string{"bashInteractive", "cacert", "coreutils", "iana-etc", "moreutils", "nano"} shellPackages := []string{"bashInteractive", "coreutils", "moreutils", "nano"}
if packages[0] == "shell" { if packages[0] == "shell" {
return append(packages[1:], shellPackages...) return append(packages[1:], shellPackages...)

24
tools/nixery/server/layers/grouping.go
View file

@ -186,13 +186,11 @@ func (c *closure) bigOrPopular() bool {
return true return true
} }
// The threshold value used here is currently roughly the // Threshold value is picked arbitrarily right now. The reason
// minimum number of references that only 1% of packages in // for this is that some packages (such as `cacert`) have very
// the entire package set have. // few direct dependencies, but are required by pretty much
// // everything.
// TODO(tazjin): Do this more elegantly by calculating if c.Popularity >= 100 {
// percentiles for each package and using those instead.
if c.Popularity >= 1000 {
return true return true
} }
@ -241,7 +239,17 @@ func buildGraph(refs *RuntimeGraph, pop *Popularity) *simple.DirectedGraph {
Refs: c.Refs, Refs: c.Refs,
} }
if p, ok := (*pop)[node.DOTID()]; ok { // The packages `nss-cacert` and `iana-etc` are added
// by Nixery to *every single image* and should have a
// very high popularity.
//
// Other popularity values are populated from the data
// set assembled by Nixery's popcount.
id := node.DOTID()
if strings.HasPrefix(id, "nss-cacert") || strings.HasPrefix(id, "iana-etc") {
// glibc has ~300k references, these packages need *more*
node.Popularity = 500000
} else if p, ok := (*pop)[id]; ok {
node.Popularity = p node.Popularity = p
} else { } else {
node.Popularity = 1 node.Popularity = 1