introduce supervisord manager

Dockerfile

@@ -25,16 +25,21 @@ COPY --from=cp_source /app/app /app/control-plane/app
 
 COPY entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
+COPY supervisord.conf /etc/supervisord.conf
+COPY bin /app/bin
+RUN chmod +x /app/bin/*.sh || true
 
 ENV PORT=7860
 ENV INGEST_URL=http://localhost:8080
 ENV ML_SERVICE_URL=http://localhost:8001
 ENV API_TESTING_URL=http://localhost:9090
 
+RUN apt-get update && apt-get install -y --no-install-recommends supervisor && rm -rf /var/lib/apt/lists/*
+
 RUN useradd -m -u 1000 appuser && \
     chown -R appuser:appuser /app
 USER appuser
 
 EXPOSE 7860
 
-ENTRYPOINT ["/app/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"]

bin/run_api_testing.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run api-testing and prefix logs with [api-testing]
+exec bash -c 'set -o pipefail; BIND_ADDR=127.0.0.1:9090 /app/api-testing/api-testing 2>&1 | sed -u "s/^/[api-testing] /"; exit ${PIPESTATUS[0]}'

bin/run_control_plane.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run control-plane (uvicorn) and prefix logs with [control-plane]
+cd /app/control-plane
+exec bash -c 'set -o pipefail; PYTHONPATH=/app/control-plane /opt/cp_venv/bin/python -u -m uvicorn app.main:app --host 0.0.0.0 --port 7860 --workers 4 2>&1 | sed -u "s/^/[control-plane] /"; exit ${PIPESTATUS[0]}'

bin/run_ingest.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run ingest-service and prefix logs with [ingest]
+exec bash -c 'set -o pipefail; /app/ingest-service/ingest-service 2>&1 | sed -u "s/^/[ingest] /"; exit ${PIPESTATUS[0]}'

bin/run_ml.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run ML service and prefix logs with [ml]
+cd /app/ml-service
+exec bash -c 'set -o pipefail; PYTHONPATH=/app/ml-service /opt/ml_venv/bin/python -u -m app.main 2>&1 | sed -u "s/^/[ml] /"; exit ${PIPESTATUS[0]}'

entrypoint.sh

@@ -26,4 +26,4 @@ unset PYTHONPATH
 # 4. Start Control Plane (Python) on the public port 7860
 cd /app/control-plane
 export PYTHONPATH=/app/control-plane
-exec /opt/cp_venv/bin/python -m uvicorn app.main:app --host 0.0.0.0 --port 7860
+exec /opt/cp_venv/bin/python -m uvicorn app.main:app --host 0.0.0.0 --port 7860 --workers 4

supervisord.conf

@@ -0,0 +1,44 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+
+[program:ingest]
+command=/app/bin/run_ingest.sh
+stdout_logfile=/dev/fd/1
+stderr_logfile=/dev/fd/2
+autorestart=true
+startretries=4
+startsecs=3
+stopsignal=TERM
+
+[program:ml]
+directory=/app/ml-service
+command=/app/bin/run_ml.sh
+environment=PYTHONPATH="/app/ml-service"
+stdout_logfile=/dev/fd/1
+stderr_logfile=/dev/fd/2
+autorestart=true
+startretries=4
+startsecs=3
+stopsignal=TERM
+
+[program:api-testing]
+command=/app/bin/run_api_testing.sh
+environment=BIND_ADDR="127.0.0.1:9090"
+stdout_logfile=/dev/fd/1
+stderr_logfile=/dev/fd/2
+autorestart=true
+startretries=4
+startsecs=3
+stopsignal=TERM
+
+[program:control-plane]
+directory=/app/control-plane
+command=/app/bin/run_control_plane.sh
+environment=PYTHONPATH="/app/control-plane"
+stdout_logfile=/dev/fd/1
+stderr_logfile=/dev/fd/2
+autorestart=true
+startretries=4
+startsecs=3
+stopsignal=TERM