feat: Add configuration option for popularity data URL

This commit is contained in:
Vincent Ambo 2019-09-21 12:15:38 +01:00 committed by Vincent Ambo
parent e4d03fdb17
commit 64f74abc4d
5 changed files with 12 additions and 5 deletions

View file

@ -134,6 +134,10 @@ func BuildImage(ctx *context.Context, cfg *config.Config, cache *LocalCache, ima
"--argstr", "srcArgs", srcArgs,
}
if cfg.PopUrl != "" {
args = append(args, "--argstr", "popularityUrl", cfg.PopUrl)
}
cmd := exec.Command("nixery-build-image", args...)
outpipe, err := cmd.StdoutPipe()

View file

@ -68,6 +68,7 @@ type Config struct {
Pkgs PkgSource // Source for Nix package set
Timeout string // Timeout for a single Nix builder (seconds)
WebDir string // Directory with static web assets
PopUrl string // URL to the Nix package popularity count
}
func FromEnv() (*Config, error) {
@ -83,5 +84,6 @@ func FromEnv() (*Config, error) {
Signing: signingOptsFromEnv(),
Timeout: getConfig("NIX_TIMEOUT", "Nix builder timeout", "60"),
WebDir: getConfig("WEB_DIR", "Static web file dir", ""),
PopUrl: os.Getenv("NIX_POPULARITY_URL"),
}, nil
}