Wire the container path up, behind a flag that says what it is
Everything the container migration needs has landed a piece at a time and nothing called any of it. `run` now does: stage pulls and verifies an image instead of downloading a binary, the recovery cycle launches a throwaway container against the live container's own mounts, and cutover recreates it. Preflight's blanket refusal of docker goes with it -- what still refuses is specific to a container rather than to containers, which is compose and data that is not on a volume. It refuses without --container-path-unproven, and that flag is the honest part of this change. Every test drives a fake docker. That proves the right commands are assembled and proves nothing about whether a real image reads the config it is handed -- which is the exact limit ARCHITECTURE.md section 4.8 records about the rollback code that was deleted for being tested only against fakes. A doc note seemed too quiet for a tool that stops a mail server, so it is a flag nobody reaches without being told. The converted config reaches the container through the data volume. It is written under the host side of whichever mount covers --data-dir and named on the container side, because cutover recreates a container with the mounts it had and cannot invent a new one for a config file. --data-dir therefore names the path inside the container, which preflight already says when it matches no mount. PatchPaths stays unused, deliberately. Its documented purpose is pointing a rehearsal at a sandbox; a real container's dumped settings already carry container-side paths, because they come from the live server rather than from a file on this host. The preflight test that asserted docker was refused outright now asserts the replacement rather than being deleted -- "docker is allowed through here" is the thing that would be wrong to regress. Its fixture had to make --data-dir both a real host directory and one the fake container mounts, since disk-space stats it and container-data-volume wants it covered. README gains the container section and, at the top, the note that this is ihasmail's companion.
This commit is contained in:
@@ -300,9 +300,9 @@ func (c *Checker) runContainerChecks(ctx context.Context, runCheck checkFunc) er
|
||||
return CheckResult{Status: status, Detail: fmt.Sprintf(
|
||||
"data dir %s is not covered by any of the container's mounts (%s), so it lives in the writable layer and would "+
|
||||
"not survive the container being replaced. Check whether --data-dir names the path inside the container",
|
||||
c.opts.DataDir, describeMounts(facts.Mounts))}, ""
|
||||
c.opts.DataDir, DescribeMounts(facts.Mounts))}, ""
|
||||
}
|
||||
return CheckResult{Status: StatusOK, Detail: "container has writable mounts: " + describeMounts(writable)}, ""
|
||||
return CheckResult{Status: StatusOK, Detail: "container has writable mounts: " + DescribeMounts(writable)}, ""
|
||||
})
|
||||
return err
|
||||
}
|
||||
@@ -322,7 +322,8 @@ func mountSource(m Mount) string {
|
||||
return m.Source
|
||||
}
|
||||
|
||||
func describeMounts(mounts []Mount) string {
|
||||
// DescribeMounts renders mounts for an operator-facing message.
|
||||
func DescribeMounts(mounts []Mount) string {
|
||||
if len(mounts) == 0 {
|
||||
return "none"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user