werkdock: ordered mounts with --tmpfs, images verb, :rw accepted

Session C groundwork: Werkator's git-metadata mask needs a tmpfs
BETWEEN binds (ro-bind .git, tmpfs .git/werkator, bind workspace), so
-v and --tmpfs now collect into one ordered mount list and RunSpec
carries Mounts instead of Binds. --tmpfs DEST is the docker flag of the
same name. `werkdock images` lists loaded image names one per line, so
a consumer can check existence through the CLI. -v accepts the explicit
:rw docker default instead of refusing it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
mhoennig
2026-09-01 15:39:31 +02:00
co-authored by Claude Fable 5
parent 263245d49e
commit a2da6454f7
9 changed files with 236 additions and 66 deletions
+22 -11
View File
@@ -65,15 +65,20 @@ func (b *Bwrap) Argv(spec RunSpec) ([]string, error) {
"--tmpfs", "/tmp",
"--tmpfs", "/root",
}
for _, bd := range spec.Binds {
if !filepath.IsAbs(bd.Dest) {
return nil, fmt.Errorf("bind destination must be an absolute path: %s", bd.Dest)
for _, m := range spec.Mounts {
if !filepath.IsAbs(m.Dest) {
return nil, fmt.Errorf("mount destination must be an absolute path: %s", m.Dest)
}
flag := "--bind"
if bd.ReadOnly {
flag = "--ro-bind"
switch m.Mode {
case MountBind:
args = append(args, "--bind", m.Source, m.Dest)
case MountRoBind:
args = append(args, "--ro-bind", m.Source, m.Dest)
case MountTmpfs:
args = append(args, "--tmpfs", m.Dest)
default:
return nil, fmt.Errorf("unknown mount mode %d for %s", m.Mode, m.Dest)
}
args = append(args, flag, bd.Source, bd.Dest)
}
args = append(args,
"--clearenv",
@@ -108,17 +113,23 @@ func EnsureMountpoints(spec RunSpec) error {
return err
}
}
for _, bd := range spec.Binds {
target, err := rootfsPath(spec.RootFS, bd.Dest)
for _, m := range spec.Mounts {
target, err := rootfsPath(spec.RootFS, m.Dest)
if err != nil {
return err
}
if _, err := os.Lstat(target); err == nil {
continue
}
src, err := os.Stat(bd.Source)
if m.Mode == MountTmpfs {
if err := os.MkdirAll(target, 0o755); err != nil {
return err
}
continue
}
src, err := os.Stat(m.Source)
if err != nil {
return fmt.Errorf("bind source %s: %w", bd.Source, err)
return fmt.Errorf("bind source %s: %w", m.Source, err)
}
if src.Mode().IsRegular() {
if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {