Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(rexctl): back up bind mounts and refuse broken overrides (#3575)

Hampus52f8b4f31fc2
diff --git a/fluxer_rexctl/cmd/upgrade.go b/fluxer_rexctl/cmd/upgrade.go
index 12f4f8fa8..eb32e02df 100644
--- a/fluxer_rexctl/cmd/upgrade.go
+++ b/fluxer_rexctl/cmd/upgrade.go
@@ -673,7 +673,9 @@ func pullRelease(ctx context.Context, app *App, inst *instance.Instance, e *engi
files[i] = filepath.Join(scratch, f)
}
}
- if fileExists(inst.Path(instance.CustomCompose)) {
+ base := slices.Clone(files)
+ custom := fileExists(inst.Path(instance.CustomCompose))
+ if custom {
files = append(files, inst.Path(instance.CustomCompose))
}
var admin map[string]string
@@ -684,16 +686,35 @@ func pullRelease(ctx context.Context, app *App, inst *instance.Instance, e *engi
if err != nil {
return ui.Wrap(err, fmt.Sprintf("Fluxer %s doesn't accept the settings on this machine.", toShort), "Run rexctl upgrade --verbose to see why.")
}
+ still := "Your instance hasn't changed."
+ if pend := inst.State.Upgrade; pend != nil {
+ fromShort, _ := versionPair(pend.From, pend.To)
+ still = fmt.Sprintf("Your instance is still on %s.", fluxerName(fromShort))
+ }
p, err := e.Load(ctx, engine.Spec{Name: inst.Project(), Dir: inst.Dir, Files: files, Env: env})
if err != nil {
if ctx.Err() != nil {
return ctx.Err()
}
+ if custom && engine.ClassOf(err) == engine.ClassInvalidConfig {
+ return ui.Refused(fmt.Sprintf("%s doesn't work with Fluxer %s: %s.", instance.CustomCompose, toShort, composeProblem(err)),
+ fmt.Sprintf("Change %s, then run rexctl upgrade again. %s", instance.CustomCompose, still))
+ }
return ui.Wrap(engineFailure(err), fmt.Sprintf("Fluxer %s doesn't accept the settings on this machine.", toShort), "Run rexctl upgrade --verbose to see why.")
}
if plan, err := p.Plan(ctx); engine.ClassOf(err) == engine.ClassVolumeChanged {
return volumeMismatch(inst, plan.Volumes, toShort)
}
+ if custom {
+ shipped, err := e.Load(ctx, engine.Spec{Name: inst.Project(), Dir: inst.Dir, Files: base, Env: env})
+ if err != nil {
+ return ui.Wrap(engineFailure(err), fmt.Sprintf("Fluxer %s doesn't accept the settings on this machine.", toShort), "Run rexctl upgrade --verbose to see why.")
+ }
+ if dropped := p.DroppedMounts(shipped); len(dropped) > 0 {
+ return ui.Refused(fmt.Sprintf("%s leaves out what Fluxer %s mounts at %s.", instance.CustomCompose, toShort, strings.Join(dropped, ", ")),
+ fmt.Sprintf("Add those mounts back to %s, then run rexctl upgrade again. %s", instance.CustomCompose, still))
+ }
+ }
err = app.UI.Step(ctx, "Downloading Fluxer "+toShort, func(ctx context.Context, s *ui.Step) error {
if err := p.Pull(ctx, app.progress(s, "Downloading")); err != nil {
return err
@@ -707,11 +728,6 @@ func pullRelease(ctx context.Context, app *App, inst *instance.Instance, e *engi
if ctx.Err() != nil {
return ctx.Err()
}
- still := "Your instance hasn't changed."
- if pend := inst.State.Upgrade; pend != nil {
- fromShort, _ := versionPair(pend.From, pend.To)
- still = fmt.Sprintf("Your instance is still on %s.", fluxerName(fromShort))
- }
report := engineFailure(err)
var ee *ui.ExitError
if errors.As(report, &ee) && ee.Err != nil {
@@ -721,6 +737,14 @@ func pullRelease(ctx context.Context, app *App, inst *instance.Instance, e *engi
return ui.Wrap(err, fmt.Sprintf("Couldn't download Fluxer %s. %s", toShort, still), "Check this machine's internet connection, then run rexctl upgrade again.")
}
+func composeProblem(err error) string {
+ var ee *engine.Error
+ if errors.As(err, &ee) && ee.Err != nil {
+ err = ee.Err
+ }
+ return strings.TrimSuffix(strings.TrimSpace(err.Error()), ": invalid compose project")
+}
+
func upAll(ctx context.Context, p *engine.Project, onEvent func(engine.Event)) error {
err := p.Up(context.WithoutCancel(ctx), engine.UpOptions{RemoveOrphans: true, OnEvent: onEvent})
if engine.ClassOf(err) != engine.ClassDependencyFailed {
diff --git a/fluxer_rexctl/internal/backup/create.go b/fluxer_rexctl/internal/backup/create.go
index 540094e6b..af584f0b7 100644
--- a/fluxer_rexctl/internal/backup/create.go
+++ b/fluxer_rexctl/internal/backup/create.go
@@ -19,6 +19,9 @@ import (
"strings"
"time"
+ "github.com/compose-spec/compose-go/v2/types"
+
+ "github.com/fluxerapp/fluxer/fluxer_rexctl/internal/deploy"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/engine"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/host"
"github.com/fluxerapp/fluxer/fluxer_rexctl/internal/instance"
@@ -95,11 +98,17 @@ func Create(ctx context.Context, inst *instance.Instance, p *engine.Project, opt
m.Release = inst.State.Release
}
values := instanceValues(inst)
+ model := p.Model
+ if model == nil {
+ if loaded, err := deploy.Load(ctx, inst, p.Engine); err == nil {
+ model = loaded.Model
+ }
+ }
bundledDB := !externalPostgres(values)
if !bundledDB {
m.Skipped = append(m.Skipped, SkippedDatabase)
}
- volumes, err := volumesToCopy(ctx, inst, values, p, m)
+ volumes, err := volumesToCopy(ctx, inst, values, p, model, m)
if err != nil {
return nil, err
}
@@ -108,7 +117,7 @@ func Create(ctx context.Context, inst *instance.Instance, p *engine.Project, opt
if err != nil {
return nil, err
}
- if _, ok := findVolume(have, p.Name, "postgres-data"); !ok {
+ if _, ok := dataVolume(model, p.Name, have, "postgres-data"); !ok {
return nil, ErrNeverStarted
}
}
@@ -225,9 +234,34 @@ func externalUploads(inst *instance.Instance, values map[string]string) bool {
type volumeRef struct {
short string
full string
+ bind string
+}
+
+func (v volumeRef) mount(target string, readOnly bool) engine.Mount {
+ return engine.Mount{Volume: v.full, Bind: v.bind, Target: target, ReadOnly: readOnly}
+}
+
+func dataVolume(model *types.Project, project string, have []engine.Volume, short string) (volumeRef, bool) {
+ if full, ok := findVolume(have, project, short); ok {
+ return volumeRef{short: short, full: full}, true
+ }
+ dm, ok := stack.DataMounts[short]
+ if !ok || model == nil {
+ return volumeRef{}, false
+ }
+ svc, ok := model.Services[dm.Service]
+ if !ok {
+ return volumeRef{}, false
+ }
+ for _, v := range svc.Volumes {
+ if v.Type == types.VolumeTypeBind && v.Target == dm.Target && v.Source != "" {
+ return volumeRef{short: short, bind: v.Source}, true
+ }
+ }
+ return volumeRef{}, false
}
-func volumesToCopy(ctx context.Context, inst *instance.Instance, values map[string]string, p *engine.Project, m *Manifest) ([]volumeRef, error) {
+func volumesToCopy(ctx context.Context, inst *instance.Instance, values map[string]string, p *engine.Project, model *types.Project, m *Manifest) ([]volumeRef, error) {
skipUploads := externalUploads(inst, values)
if skipUploads {
m.Skipped = append(m.Skipped, SkippedUploads)
@@ -241,8 +275,8 @@ func volumesToCopy(ctx context.Context, inst *instance.Instance, values map[stri
if skipUploads && short == "seaweedfs-data" {
continue
}
- if full, ok := findVolume(have, p.Name, short); ok {
- out = append(out, volumeRef{short: short, full: full})
+ if v, ok := dataVolume(model, p.Name, have, short); ok {
+ out = append(out, v)
}
}
return out, nil
@@ -323,7 +357,7 @@ func checkDisk(ctx context.Context, p *engine.Project, image, dir string, volume
var paths []string
for i, v := range volumes {
mp := "/v/" + strconv.Itoa(i)
- mounts = append(mounts, engine.Mount{Volume: v.full, Target: mp, ReadOnly: true})
+ mounts = append(mounts, v.mount(mp, true))
paths = append(paths, mp)
}
var out bytes.Buffer
@@ -557,7 +591,7 @@ func copyVolume(ctx context.Context, w *archiveWriter, p *engine.Project, image
Image: image,
Entrypoint: []string{"sh", "-c"},
Command: []string{volumeTarScript},
- Mounts: []engine.Mount{{Volume: v.full, Target: "/data", ReadOnly: true}},
+ Mounts: []engine.Mount{v.mount("/data", true)},
Stdout: pw,
Stderr: &stderr,
})
diff --git a/fluxer_rexctl/internal/backup/restore.go b/fluxer_rexctl/internal/backup/restore.go
index f644872ac..c3041e4e4 100644
--- a/fluxer_rexctl/internal/backup/restore.go
+++ b/fluxer_rexctl/internal/backup/restore.go
@@ -140,12 +140,6 @@ func Restore(ctx context.Context, path, dir string, e *engine.Engine, opts Resto
return nil, &RestoreError{Part: "containers", Err: err}
}
- if m.Database != "" {
- progress(StageDatabase)
- if err := startPostgres(ctx, p); err != nil {
- return nil, err
- }
- }
vols, err := e.Volumes(ctx, p.Name)
if err != nil {
return nil, err
@@ -154,6 +148,17 @@ func Restore(ctx context.Context, path, dir string, e *engine.Engine, opts Resto
if err != nil {
return nil, err
}
+ if m.Database != "" {
+ progress(StageDatabase)
+ if v, ok := dataVolume(p.Model, p.Name, vols, "postgres-data"); ok && v.bind != "" {
+ if err := helper(ctx, p, image, []engine.Mount{v.mount("/data", false)}, nil, io.Discard, "find", "/data", "-mindepth", "1", "-delete"); err != nil {
+ return nil, &RestoreError{Part: "database", Err: err}
+ }
+ }
+ if err := startPostgres(ctx, p); err != nil {
+ return nil, err
+ }
+ }
if err := restoreData(ctx, path, p, image, m, vols, progress); err != nil {
return nil, err
}
@@ -395,7 +400,7 @@ func restoreData(ctx context.Context, path string, p *engine.Project, image stri
var sink *volumeSink
closeSink := func(failed error) error {
if sink == nil {
- return nil
+ return failed
}
s := sink
sink = nil
@@ -416,7 +421,7 @@ func restoreData(ctx context.Context, path string, p *engine.Project, image stri
return nil
}
openSink := func(short string) error {
- full, ok := findVolume(vols, p.Name, short)
+ v, ok := dataVolume(p.Model, p.Name, vols, short)
if !ok {
return &RestoreError{Part: short, Err: errors.New("the volume wasn't created")}
}
@@ -427,7 +432,7 @@ func restoreData(ctx context.Context, path string, p *engine.Project, image stri
Image: image,
Entrypoint: []string{"sh", "-c"},
Command: []string{"find /data -mindepth 1 -delete && exec tar -xf - -C /data"},
- Mounts: []engine.Mount{{Volume: full, Target: "/data"}},
+ Mounts: []engine.Mount{v.mount("/data", false)},
Stdin: pr,
Stderr: s.out,
})
diff --git a/fluxer_rexctl/internal/engine/api.go b/fluxer_rexctl/internal/engine/api.go
index 397e5ee3e..4a265c7a6 100644
--- a/fluxer_rexctl/internal/engine/api.go
+++ b/fluxer_rexctl/internal/engine/api.go
@@ -110,6 +110,7 @@ type HelperOptions struct {
type Mount struct {
Volume string
+ Bind string
Target string
ReadOnly bool
}
diff --git a/fluxer_rexctl/internal/engine/exec.go b/fluxer_rexctl/internal/engine/exec.go
index 00ff03ddf..e28410920 100644
--- a/fluxer_rexctl/internal/engine/exec.go
+++ b/fluxer_rexctl/internal/engine/exec.go
@@ -217,6 +217,10 @@ func (p *Project) Helper(ctx context.Context, o HelperOptions) error {
}
mounts := make([]mount.Mount, 0, len(o.Mounts))
for _, m := range o.Mounts {
+ if m.Bind != "" {
+ mounts = append(mounts, mount.Mount{Type: mount.TypeBind, Source: m.Bind, Target: m.Target, ReadOnly: m.ReadOnly})
+ continue
+ }
mounts = append(mounts, mount.Mount{Type: mount.TypeVolume, Source: p.volumeName(ctx, c, m.Volume), Target: m.Target, ReadOnly: m.ReadOnly})
}
for attempt := 1; ; attempt++ {
diff --git a/fluxer_rexctl/internal/engine/plan.go b/fluxer_rexctl/internal/engine/plan.go
index a8db1c250..8d5aa1782 100644
--- a/fluxer_rexctl/internal/engine/plan.go
+++ b/fluxer_rexctl/internal/engine/plan.go
@@ -194,3 +194,19 @@ func sameOptions(want map[string]string, live map[string]string) bool {
}
return maps.Equal(want, live)
}
+
+func (p *Project) DroppedMounts(shipped *Project) []string {
+ var out []string
+ for _, name := range slices.Sorted(maps.Keys(shipped.Model.Services)) {
+ svc, ok := p.Model.Services[name]
+ if !ok {
+ continue
+ }
+ for _, v := range shipped.Model.Services[name].Volumes {
+ if !slices.ContainsFunc(svc.Volumes, func(m types.ServiceVolumeConfig) bool { return m.Target == v.Target }) {
+ out = append(out, v.Target+" on "+name)
+ }
+ }
+ }
+ return out
+}
diff --git a/fluxer_rexctl/internal/stack/services.go b/fluxer_rexctl/internal/stack/services.go
index 48aa2a623..611a4ef65 100644
--- a/fluxer_rexctl/internal/stack/services.go
+++ b/fluxer_rexctl/internal/stack/services.go
@@ -21,6 +21,19 @@ var Volumes = []string{
var BackupVolumes = []string{"seaweedfs-data", "valkey-data", "nats-data", "meilisearch-data"}
+type DataMount struct {
+ Service string
+ Target string
+}
+
+var DataMounts = map[string]DataMount{
+ "postgres-data": {Service: "postgres", Target: "/var/lib/postgresql/data"},
+ "valkey-data": {Service: "valkey", Target: "/data"},
+ "nats-data": {Service: "nats", Target: "/data"},
+ "meilisearch-data": {Service: "meilisearch", Target: "/meili_data"},
+ "seaweedfs-data": {Service: "seaweedfs", Target: "/data"},
+}
+
var PublishedPorts = []Port{
{Number: 80, Proto: "tcp"},
{Number: 443, Proto: "tcp"},
diff --git a/fluxer_rexctl/internal/ui/ui.go b/fluxer_rexctl/internal/ui/ui.go
index 93b51d5ab..ea1bf69da 100644
--- a/fluxer_rexctl/internal/ui/ui.go
+++ b/fluxer_rexctl/internal/ui/ui.go
@@ -320,8 +320,20 @@ func (u *UI) ReportError(err error) {
} else {
u.Fail(msg, ee.Fix)
}
- if ee.Err != nil && ee.Msg != "" {
- u.Detail("%v", ee.Err)
+ if ee.Msg == "" {
+ return
+ }
+ for cause := ee.Err; cause != nil; {
+ var inner *ExitError
+ if !errors.As(cause, &inner) {
+ u.Detail("%v", cause)
+ return
+ }
+ if inner.Err == nil {
+ u.Detail("%v", inner)
+ return
+ }
+ cause = inner.Err
}
}