Merge branch docker-image.

Author: plmick

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.7-slim-trixie
+FROM python:3.13.9-slim-trixie
 
 ARG version=prod
 ARG GIT_REF=main
@@ -14,21 +14,17 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y supervisor htop c
 
 WORKDIR /srv/
 
-
 RUN git clone https://github.com/radlab-dev-group/llm-router.git && \
     cd /srv/llm-router && \
-    git checkout ${GIT_REF} && \
-    cat .git/HEAD > .version && git log -1 | head -1 >> .version && \
-    rm -rf .git .gitignore
+    git checkout ${GIT_REF}
 
 WORKDIR /srv/llm-router
 
-RUN pip3 install --upgrade pip && pip3 install -r requirements.txt
-
-RUN pip3 install git+https://github.com/radlab-dev-group/ml-utils.git
+RUN pip3 install --upgrade pip
+RUN pip3 install --no-cache-dir .
+RUN pip3 install --no-cache-dir .[api]
 
+COPY entrypoint.sh entrypoint.sh
 RUN chmod +x run-rest-api.sh && chmod +x entrypoint.sh
 
-RUN cd llm_router_web && pip3 install -r requirements.txt && cd ..
-
 ENTRYPOINT ["/srv/llm-router/entrypoint.sh"]

entrypoint.sh

@@ -1,13 +1,33 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
-if [ "$1" = "SLEEP" ]; then
-  echo "[Entrypoint] Debug mode: sleeping indefinitely..."
-  sleep infinity
+# Default values
+APP_SCRIPT="run-rest-api-gunicorn.sh"
+DEBUG_MODE=false
+
+for arg in "$@"; do
+    case "$arg" in
+        --debug|debug|--shell|shell)
+            DEBUG_MODE=true
+            ;;
+        --runserver|runserver)
+            APP_SCRIPT="run-rest-api.sh"
+            ;;
+    esac
+done
+
+echo "[entrypoint] Working directory: $(pwd)"
+
+if [ "$DEBUG_MODE" = true ]; then
+    echo "[entrypoint] Debug mode activated. Container will stay alive for exec."
+    sleep infinity
+    exit 0
 fi
 
-echo "[Entrypoint] Creating supervisord.conf ..."
-envsubst < docker/supervisord.conf.template > /etc/supervisor/conf.d/supervisord.conf
+if [ ! -f "./$APP_SCRIPT" ]; then
+    echo "[entrypoint] ERROR: Script $APP_SCRIPT not found!"
+    exit 1
+fi
 
-echo "[Entrypoint] Starting supervisord..."
-supervisord
+echo "[entrypoint] Starting application using $APP_SCRIPT ..."
+exec "./$APP_SCRIPT"

requirements.txt

@@ -2,5 +2,8 @@ flask
 gunicorn
 redis
 prometheus_client
+python-dateutil
+# gevent
+
 
 python-gnupg