hst/container: pack boolean options
All checks were successful
Test / Create distribution (push) Successful in 33s
Test / Sandbox (push) Successful in 2m12s
Test / Hakurei (push) Successful in 3m8s
Test / Hpkg (push) Successful in 4m2s
Test / Hakurei (race detector) (push) Successful in 4m46s
Test / Sandbox (race detector) (push) Successful in 2m11s
Test / Flake checks (push) Successful in 1m37s
All checks were successful
Test / Create distribution (push) Successful in 33s
Test / Sandbox (push) Successful in 2m12s
Test / Hakurei (push) Successful in 3m8s
Test / Hpkg (push) Successful in 4m2s
Test / Hakurei (race detector) (push) Successful in 4m46s
Test / Sandbox (race detector) (push) Successful in 2m11s
Test / Flake checks (push) Successful in 1m37s
The memory saving is relatively insignificant, however this increases serialisation efficiency. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -76,15 +76,7 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *check.Absolute, argv []
|
||||
Groups: app.Groups,
|
||||
|
||||
Container: &hst.ContainerConfig{
|
||||
Hostname: formatHostname(app.Name),
|
||||
Devel: app.Devel,
|
||||
Userns: app.Userns,
|
||||
HostNet: app.HostNet,
|
||||
HostAbstract: app.HostAbstract,
|
||||
Device: app.Device,
|
||||
Tty: app.Tty || flagDropShell,
|
||||
MapRealUID: app.MapRealUID,
|
||||
Multiarch: app.Multiarch,
|
||||
Hostname: formatHostname(app.Name),
|
||||
Filesystem: []hst.FilesystemConfigJSON{
|
||||
{FilesystemConfig: &hst.FSBind{Target: fhs.AbsEtc, Source: pathSet.cacheDir.Append("etc"), Special: true}},
|
||||
{FilesystemConfig: &hst.FSBind{Source: pathSet.nixPath.Append("store"), Target: pathNixStore}},
|
||||
@@ -113,6 +105,31 @@ func (app *appInfo) toHst(pathSet *appPathSet, pathname *check.Absolute, argv []
|
||||
{Ensure: true, Path: pathSet.baseDir, Read: true, Write: true, Execute: true},
|
||||
},
|
||||
}
|
||||
|
||||
if app.Devel {
|
||||
config.Container.Flags |= hst.FDevel
|
||||
}
|
||||
if app.Userns {
|
||||
config.Container.Flags |= hst.FUserns
|
||||
}
|
||||
if app.HostNet {
|
||||
config.Container.Flags |= hst.FHostNet
|
||||
}
|
||||
if app.HostAbstract {
|
||||
config.Container.Flags |= hst.FHostAbstract
|
||||
}
|
||||
if app.Device {
|
||||
config.Container.Flags |= hst.FDevice
|
||||
}
|
||||
if app.Tty || flagDropShell {
|
||||
config.Container.Flags |= hst.FTty
|
||||
}
|
||||
if app.MapRealUID {
|
||||
config.Container.Flags |= hst.FMapRealUID
|
||||
}
|
||||
if app.Multiarch {
|
||||
config.Container.Flags |= hst.FMultiarch
|
||||
}
|
||||
return config
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user