Files
dokku/plugins/storage/report.go
T
Jose Diaz-Gonzalez b612285392 fix: honor storage attachment process types at deploy time
An attachment's process type was recorded, reported and used to scope `storage:mount --replace` and `storage:unmount --all`, but nothing read it when the volume was actually mounted, so `storage:mount <app> <entry> --container-dir <path> --process-type web` bound the volume into every process rather than only `web`. Both schedulers now scope a mount to the process type it was declared for, and containers that belong to no process type - a `dokku run` one-off, an `app.json` deploy task, a k3s cron job - receive default-scoped mounts only. A container path can now be claimed by a single mount per process type, and `storage:migrate` drains process-scoped `-v` lines out of `docker-options` rather than only the default-scoped ones.
2026-09-21 18:08:42 -04:00

95 lines
3.2 KiB
Go

package storage
import (
"fmt"
"strconv"
"strings"
"github.com/dokku/dokku/plugins/common"
)
func ReportSingleApp(appName string, format string, infoFlag string) error {
if appName != "--global" {
if err := common.VerifyAppName(appName); err != nil {
return err
}
}
flags := map[string]common.ReportFunc{}
if appName != "--global" {
flags["--storage-build-mounts"] = reportBuildMounts
flags["--storage-deploy-mounts"] = reportDeployMounts
flags["--storage-run-mounts"] = reportRunMounts
attachments, err := LoadAttachments(appName)
if err != nil {
common.LogWarn(fmt.Sprintf("Unable to load storage attachments for %q: %s", appName, err))
attachments = nil
}
index := 0
for _, attachment := range attachments {
entry, err := LoadEntry(attachment.EntryName)
if err != nil {
common.LogWarn(fmt.Sprintf("Skipping attachment on %q: missing entry %q (%s)", appName, attachment.EntryName, err))
continue
}
index++
registerAttachmentFlags(flags, index, attachment, entry)
}
}
flagKeys := []string{}
for flagKey := range flags {
flagKeys = append(flagKeys, flagKey)
}
infoFlags := common.CollectReport(appName, infoFlag, flags)
return common.ReportSingleApp(common.ReportSingleAppInput{
ReportType: "storage",
AppName: appName,
InfoFlag: infoFlag,
InfoFlags: infoFlags,
InfoFlagKeys: flagKeys,
Format: format,
TrimPrefix: true,
UppercaseFirstCharacter: true,
EmitLegacyPrefix: true,
})
}
func reportBuildMounts(appName string) string {
return GetBindMountsForDisplay(appName, "build")
}
func reportDeployMounts(appName string) string {
return GetBindMountsForDisplay(appName, "deploy")
}
func reportRunMounts(appName string) string {
return GetBindMountsForDisplay(appName, "run")
}
// registerAttachmentFlags adds one report flag per Attachment field for the
// given 1-based index. Host path is resolved from the referenced Entry
// (falling back to entry.Name when the entry has no host path, matching
// ListAppMountEntries). Process type is reported as the scope the attachment
// actually deploys under, so a row written before the field existed reads as
// _default_ rather than blank.
func registerAttachmentFlags(flags map[string]common.ReportFunc, index int, att *Attachment, entry *Entry) {
prefix := fmt.Sprintf("--storage-attachment.%d.", index)
captured := att
host := entry.HostPath
if host == "" {
host = entry.Name
}
flags[prefix+"entry-name"] = func(string) string { return captured.EntryName }
flags[prefix+"host-path"] = func(string) string { return host }
flags[prefix+"container-path"] = func(string) string { return captured.ContainerPath }
flags[prefix+"phases"] = func(string) string { return strings.Join(captured.Phases, ",") }
flags[prefix+"process-type"] = func(string) string { return captured.EffectiveProcessType() }
flags[prefix+"subpath"] = func(string) string { return captured.Subpath }
flags[prefix+"readonly"] = func(string) string { return strconv.FormatBool(captured.Readonly) }
flags[prefix+"volume-options"] = func(string) string { return captured.VolumeOptions }
flags[prefix+"volume-chown"] = func(string) string { return captured.VolumeChown }
}