imjasonh/kontain.me
1
0
Fork 0
mirror of https://github.com/imjasonh/kontain.me synced 2026-07-16 12:21:53 +00:00
Code Activity

Respect defaultBaseImage in .ko.yaml

Browse source
This commit is contained in:
Jason Hall 2020-10-03 21:19:27 -04:00
parent c5391cf688
commit e62876cd92
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmd/ko/main.go
View file

@ -178,7 +178,6 @@ func (s *server) getKoYAMLBaseImage(ip string) (string, error) {
orig := ip
for ; ip != "."; ip = filepath.Dir(ip) {
fp := filepath.Join(gopath, "src", ip, ".ko.yaml")
s.info.Printf("Looking for %s ...", fp)
f, err := os.Open(fp)
if os.IsNotExist(err) {
// Keep walking.
@ -186,18 +185,22 @@ func (s *server) getKoYAMLBaseImage(ip string) (string, error) {
} else if err != nil {
return "", err
}
defer f.Close()
s.info.Printf("Found .ko.yaml at %q", fp)
// .ko.yaml was found, let's try to parse it.
var y struct {
DefaultBaseImage string `yaml:"defaultBaseImage"`
BaseImageOverrides map[string]string `yaml:"baseImageOverrides"`
}
if err := yaml.NewDecoder(f).Decode(&y); err != nil {
return "", err
}
f.Close()
return y.BaseImageOverrides[orig], nil
if bio, ok := y.BaseImageOverrides[orig]; ok {
return bio, nil
}
return y.DefaultBaseImage, nil
}
// No .ko.yaml found walking up to repo root.
return "", nil