A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(rexctl): restart stack when init container is gone (#3604)
Hampus02bb142e61db
diff --git a/fluxer_rexctl/internal/engine/apply.go b/fluxer_rexctl/internal/engine/apply.goindex c4f3ef855..cea4b1593 100644--- a/fluxer_rexctl/internal/engine/apply.go+++ b/fluxer_rexctl/internal/engine/apply.go@@ -202,13 +202,7 @@ func (p *Project) startNamed(ctx context.Context, c *conn, services []string) erif err != nil {return err}- labelled := true- for _, ct := range containers {- if slices.Contains(services, ct.Service) && ct.Labels[api.ConfigHashLabel] == "" {- labelled = false- }- }- if labelled {+ if composeCanStart(containers, services) {return p.wrap("start", c.svc.Start(ctx, p.Name, api.StartOptions{AttachTo: services}))}cli := c.cli.Client()@@ -223,6 +217,33 @@ func (p *Project) startNamed(ctx context.Context, c *conn, services []string) erreturn nil}+func composeCanStart(containers []Container, services []string) bool {+ byService := make(map[string]Container, len(containers))+ for _, ct := range containers {+ byService[ct.Service] = ct+ }+ pending := slices.Clone(services)+ seen := map[string]bool{}+ for len(pending) > 0 {+ name := pending[len(pending)-1]+ pending = pending[:len(pending)-1]+ if seen[name] {+ continue+ }+ seen[name] = true+ ct, ok := byService[name]+ if !ok || ct.Labels[api.ConfigHashLabel] == "" {+ return false+ }+ for dep := range strings.SplitSeq(ct.Labels[api.DependenciesLabel], ",") {+ if dep, _, _ = strings.Cut(dep, ":"); dep != "" {+ pending = append(pending, dep)+ }+ }+ }+ return true+}+func (p *Project) present(ctx context.Context, op string, services []string) error {containers, err := p.PS(ctx)if err != nil {