Patch JVB autoscaler sidecar config to not use s6-overlay

Signed-off-by: Rhea Danzey <[email protected]>
matrix-org · Nov 27, 2023 · 80d5b12 · 80d5b12
1 parent e63d85f
commit 80d5b12
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/jvb/rootfs/etc/supervisor/conf.d/20_autoscaler_sidecar.conf b/jvb/rootfs/etc/supervisor/conf.d/20_autoscaler_sidecar.conf
@@ -0,0 +1,6 @@
+[program:jvb-autoscaler-sidecar]
+command=/bin/bash -c "/usr/bin/service_wrapper_autoscaler_sidecar"
+autorestart=unexpected
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
diff --git a/.../etc/services.d/50-autoscaler-sidecar/run → ...sr/bin/service_wrapper_autoscaler_sidecar b/.../etc/services.d/50-autoscaler-sidecar/run → ...sr/bin/service_wrapper_autoscaler_sidecar
@@ -1,10 +1,10 @@
-#!/usr/bin/with-contenv bash
+#!/bin/bash
 
 if [[ -n "$AUTOSCALER_URL" ]] && [[ -f "/etc/jitsi/autoscaler-sidecar/config" ]]; then
     DAEMON="/usr/bin/node /usr/share/jitsi-autoscaler-sidecar/app.js"
-    exec s6-setuidgid autoscaler-sidecar /bin/bash -c ". /etc/jitsi/autoscaler-sidecar/config && exec $DAEMON"
+    /bin/bash -c ". /etc/jitsi/autoscaler-sidecar/config && exec $DAEMON"
 else
     # if autoscaler-sidecar should not be started,
     # prevent s6 from restarting this script again and again
-    s6-svc -O /var/run/s6/services/50-autoscaler-sidecar
+    supervisorctl stop jvb-autoscaler-sidecar
 fi