Simplify container startup by dropping supervisord

Author: Saravana Kumar Rajendran

deploy/supervisord.conf

@@ -85,7 +85,7 @@ ARG FRONTEND2_DIR=frontend2-static
 
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install -y curl git libpq5 gnupg nginx supervisor \
+    && apt-get install -y curl git libpq5 gnupg nginx \
     && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
@@ -99,12 +99,10 @@ ENV PATH="/app/.venv/bin:$PATH"
 
 COPY ${FRONTEND2_DIR}/ /usr/share/nginx/frontend2/
 COPY deploy/nginx-extra.conf /etc/nginx/conf.d/frontend2.conf.template
-COPY deploy/supervisord.conf /etc/supervisor/conf.d/langflow.conf
 COPY scripts/start_with_nginx.sh /app/scripts/start_with_nginx.sh
 
 RUN chmod +x /app/scripts/start_with_nginx.sh \
-    && rm /etc/nginx/conf.d/default.conf \
-    && mkdir -p /var/log/supervisor
+    && rm /etc/nginx/conf.d/default.conf
 
 LABEL org.opencontainers.image.title=langflow
 LABEL org.opencontainers.image.authors=['Langflow']

docker/build_and_push.Dockerfile

@@ -1,13 +1,14 @@
 #!/bin/sh
-set -e
+set -eu
 
 BACKEND_HOST="${LANGFLOW_HOST:-0.0.0.0}"
 PUBLIC_PORT="${LANGFLOW_PORT:-7860}"
 BACKEND_PORT="${LANGFLOW_BACKEND_PORT:-7861}"
 
 export LANGFLOW_HOST="$BACKEND_HOST"
-export LANGFLOW_PORT="$PUBLIC_PORT"
 export LANGFLOW_BACKEND_PORT="$BACKEND_PORT"
+export LANGFLOW_PUBLIC_PORT="$PUBLIC_PORT"
+export LANGFLOW_PORT="$BACKEND_PORT"
 
 CONFIG_TEMPLATE="/etc/nginx/conf.d/frontend2.conf.template"
 CONFIG_PATH="/etc/nginx/conf.d/frontend2.conf"
@@ -19,4 +20,39 @@ if [ -f "$CONFIG_TEMPLATE" ]; then
     "$CONFIG_TEMPLATE" > "$CONFIG_PATH"
 fi
 
-exec supervisord -c /etc/supervisor/conf.d/langflow.conf
+cleanup() {
+  if [ -n "${BACKEND_PID:-}" ] && kill -0 "$BACKEND_PID" 2>/dev/null; then
+    kill "$BACKEND_PID"
+  fi
+  if [ -n "${NGINX_PID:-}" ] && kill -0 "$NGINX_PID" 2>/dev/null; then
+    kill "$NGINX_PID"
+  fi
+}
+
+trap 'cleanup' INT TERM
+
+/usr/sbin/runuser -u user -- langflow run --host "$BACKEND_HOST" --port "$BACKEND_PORT" --log-level info &
+BACKEND_PID=$!
+
+/usr/sbin/nginx -g "daemon off;" &
+NGINX_PID=$!
+
+while :; do
+  if ! kill -0 "$BACKEND_PID" 2>/dev/null; then
+    wait "$BACKEND_PID"
+    EXIT_CODE=$?
+    cleanup
+    wait "$NGINX_PID" 2>/dev/null || true
+    exit "$EXIT_CODE"
+  fi
+
+  if ! kill -0 "$NGINX_PID" 2>/dev/null; then
+    wait "$NGINX_PID"
+    EXIT_CODE=$?
+    cleanup
+    wait "$BACKEND_PID" 2>/dev/null || true
+    exit "$EXIT_CODE"
+  fi
+
+  sleep 1
+done