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

feat!: introduce new distribution structure

Browse Source 
BREAKING CHANGE: distro definition in the configuration files has switched

from

  [[supported_kernels]]
  distro_type = "Ubuntu"
  distro_release = "16.04"
  ...

to

  [[supported_kernels]]
  distro = { id = "Ubuntu", release = "16.04" }
  ...
This commit is contained in:
dump_stack()
2023-05-18 16:07:24 +00:00
parent 8d2d56bea3
commit bcf8de336f
24 changed files with 219 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
container/container.go
View File

@ -21,14 +21,14 @@ import (
"github.com/rs/zerolog/log"
"code.dumpstack.io/tools/out-of-tree/config"
"code.dumpstack.io/tools/out-of-tree/distro"
)
var Runtime = "docker"
type Image struct {
Name string
DistroType config.DistroType
DistroRelease string // 18.04/7/9
Name string
Distro distro.Distro
}
func Images() (diis []Image, err error) {
@ -51,14 +51,14 @@ func Images() (diis []Image, err error) {
s := strings.Replace(containerName, "__", ".", -1)
values := strings.Split(s, "_")
distro, ver := values[3], values[4]
distroName, ver := values[3], values[4]
dii := Image{
Name: containerName,
DistroRelease: ver,
Name: containerName,
}
dii.DistroType, err = config.NewDistroType(distro)
dii.Distro.Release = ver
dii.Distro.ID, err = distro.NewID(distroName)
if err != nil {
return
}
@ -69,7 +69,7 @@ func Images() (diis []Image, err error) {
}
func ImagePath(sk config.KernelMask) string {
return config.Dir("containers", sk.DistroType.String(), sk.DistroRelease)
return config.Dir("containers", sk.Distro.ID.String(), sk.Distro.Release)
}
type Volumes struct {