tools/out-of-tree
1
0
Fork 0
Code Releases Activity

fix: fetch prebuilt containers in kernel list-remote

Browse Source
This commit is contained in:
dump_stack() 2024-02-21 17:25:09 +00:00
parent 86213c171a
commit cc5e70373f
Signed by: dump_stack
GPG Key ID: C9905BA72B5E02BB
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/kernel.go
View File

@ -166,6 +166,21 @@ func (cmd *KernelCmd) GenKernel(km artifact.Target, pkg string) {
}
}
func (cmd *KernelCmd) fetchContainerCache(c container.Container) {
if !cmd.ContainerCache {
return
}
if c.Exist() {
return
}
path := cache.ContainerURL(c.Name())
err := container.Import(path, c.Name())
if err == nil {
log.Info().Msgf("container %s -> %s", path, c.Name())
}
}
func (cmd *KernelCmd) Generate(g *Globals, km artifact.Target) (err error) {
defer func() {
if err != nil {
@ -206,16 +221,7 @@ func (cmd *KernelCmd) Generate(g *Globals, km artifact.Target) (err error) {
return
}
if !c.Exist() && cmd.ContainerCache {
path := cache.ContainerURL(c.Name())
err = container.Import(path, c.Name())
if err != nil {
err = nil
} else {
log.Info().Msgf("container %s -> %s",
path, c.Name())
}
}
cmd.fetchContainerCache(c)
pkgs, err := kernel.MatchPackages(km)
if err != nil || cmd.shutdown {
@ -310,6 +316,13 @@ func (cmd *KernelListRemoteCmd) Run(kernelCmd *KernelCmd, g *Globals) (err error
container.Registry = g.Config.Docker.Registry
container.Commands = g.Config.Docker.Commands
c, err := container.New(km.Distro)
if err != nil {
return
}
kernelCmd.fetchContainerCache(c)
pkgs, err := kernel.MatchPackages(km)
// error check skipped on purpose