Skip to content

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

TypeScript fluxerfluxerapp

fix(rexctl): run the pinned caddy image on voice edges (#3889)

Hampus573afe248c9d
diff --git a/fluxer_rexctl/cmd/voice_join.go b/fluxer_rexctl/cmd/voice_join.go
index 6457f82cf..0284640eb 100644
--- a/fluxer_rexctl/cmd/voice_join.go
+++ b/fluxer_rexctl/cmd/voice_join.go
@@ -1084,6 +1084,9 @@ func ensureVoiceEdge(ctx context.Context, app *App, e *engine.Engine, inst *inst
func voiceEdgeSpec(inst *instance.Instance) engine.Spec {
env := map[string]string{"FLUXER_VOICE_NETWORK": voice.MachineNetwork}
+ if ref := ownEdgeImage(); ref != "" {
+ env[settings.ImageVars["edge"]] = ref
+ }
if inst.State.VoiceEdge != nil && inst.State.VoiceEdge.Email != "" {
env["FLUXER_VOICE_EDGE_EMAIL"] = inst.State.VoiceEdge.Email
}
diff --git a/fluxer_rexctl/cmd/voice_ops.go b/fluxer_rexctl/cmd/voice_ops.go
index a09dd2842..76e15dcca 100644
--- a/fluxer_rexctl/cmd/voice_ops.go
+++ b/fluxer_rexctl/cmd/voice_ops.go
@@ -95,6 +95,26 @@ func ownLiveKitImage() string {
return voice.DefaultImage
}
+func ownEdgeImage() string {
+ images, err := stack.EmbeddedImages()
+ if err != nil {
+ return ""
+ }
+ ref, err := images.Image("edge")
+ if err != nil || ref == "" {
+ return ""
+ }
+ shipped, err := voice.ShippedFile(stack.Embedded(), voice.EdgeComposeFile)
+ if err != nil {
+ return ""
+ }
+ def, ok := stack.ImageDefault(stack.ComposeImages(shipped)["edge"])
+ if name, _, _ := strings.Cut(ref, "@"); !ok || name != def {
+ return ""
+ }
+ return ref
+}
+
func instanceLiveKitImage(inst *instance.Instance) string {
name := settings.ImageVars["livekit"]
for _, ref := range []string{inst.State.Settings[settings.ImagesPrefix+"livekit"], inst.State.Settings[name], inst.State.Images.Refs["livekit"], inst.Setting(name)} {