diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-05-13T15·54+0200 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-05-23T15·04+0000 |
| commit | 796ff086bea3e060e61d8c56d38441898025ed1c (patch) | |
| tree | 3fcbe922f6571a42871af449519873a06db5449c /tools/nixery/builder/builder.go | |
| parent | d60feb21e8c9744de233bb15662bb6fe9e2f934f (diff) | |
refactor(nixery): Extract layering logic into separate package r/4105
This will be required for making a standalone, Nixery-style image builder function usable from Nix. Change-Id: I5e36348bd4c32d249d56f6628cd046916691319f Reviewed-on: https://cl.tvl.fyi/c/depot/+/5601 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tools/nixery/builder/builder.go')
| -rw-r--r-- | tools/nixery/builder/builder.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/nixery/builder/builder.go b/tools/nixery/builder/builder.go index 37c9b9fcb763..901373b57e99 100644 --- a/tools/nixery/builder/builder.go +++ b/tools/nixery/builder/builder.go @@ -23,6 +23,7 @@ import ( "strings" "github.com/google/nixery/config" + "github.com/google/nixery/layers" "github.com/google/nixery/manifest" "github.com/google/nixery/storage" log "github.com/sirupsen/logrus" @@ -39,7 +40,7 @@ type State struct { Storage storage.Backend Cache *LocalCache Cfg config.Config - Pop Popularity + Pop layers.Popularity } // Architecture represents the possible CPU architectures for which @@ -117,7 +118,7 @@ type ImageResult struct { Pkgs []string `json:"pkgs"` // These fields are populated in case of success - Graph runtimeGraph `json:"runtimeGraph"` + Graph layers.RuntimeGraph `json:"runtimeGraph"` SymlinkLayer struct { Size int `json:"size"` TarHash string `json:"tarHash"` @@ -281,7 +282,7 @@ func prepareImage(s *State, image *Image) (*ImageResult, error) { // added only after successful uploads, which guarantees that entries // retrieved from the cache are present in the bucket. func prepareLayers(ctx context.Context, s *State, image *Image, result *ImageResult) ([]manifest.Entry, error) { - grouped := groupLayers(&result.Graph, &s.Pop, LayerBudget) + grouped := layers.GroupLayers(&result.Graph, &s.Pop, LayerBudget) var entries []manifest.Entry @@ -318,7 +319,7 @@ func prepareLayers(ctx context.Context, s *State, image *Image, result *ImageRes var pkgs []string for _, p := range l.Contents { - pkgs = append(pkgs, packageFromPath(p)) + pkgs = append(pkgs, layers.PackageFromPath(p)) } log.WithFields(log.Fields{ |