maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(server): Cache built manifests to the GCS bucket

Browse source 
Caches manifests under `manifests/$cacheKey` in the GCS bucket and
introduces two-tiered retrieval of manifests from the caches (local
first, bucket second).

There is some cleanup to be done in this code, but the initial version
works.
This commit is contained in:
Vincent Ambo 2019-09-09 16:41:52 +01:00 • committed by Vincent Ambo
parent 051eb77b3d
commit 4a58b0ab4d
3 changed files with 97 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,8 +109,8 @@ func convenienceNames(packages []string) []string {
// Call out to Nix and request that an image be built. Nix will, upon success,
// return a manifest for the container image.
func BuildImage(ctx *context.Context, cfg *config.Config, cache *BuildCache, image *Image, bucket *storage.BucketHandle) (*BuildResult, error) {
resultFile, cached := cache.manifestFromCache(cfg.Pkgs, image)
func BuildImage(ctx *context.Context, cfg *config.Config, cache *LocalCache, image *Image, bucket *storage.BucketHandle) (*BuildResult, error) {
resultFile, cached := manifestFromCache(ctx, bucket, cfg.Pkgs, cache, image)
if !cached {
packages, err := json.Marshal(image.Packages)
@ -158,7 +158,7 @@ func BuildImage(ctx *context.Context, cfg *config.Config, cache *BuildCache, ima
log.Println("Finished Nix image build")
resultFile = strings.TrimSpace(string(stdout))
cache.cacheManifest(cfg.Pkgs, image, resultFile)
cacheManifest(ctx, bucket, cfg.Pkgs, cache, image, resultFile)
}
buildOutput, err := ioutil.ReadFile(resultFile)