chore: update Docker setup and configurations

- Adjust healthcheck intervals and retries in `compose.yml`
- Update `Dockerfile` with new dependencies and cleanup
- Add database initialization handling to entrypoint
- Replace Flask static handling in `factory.py`
- Remove deprecated files and align configuration files with latest standards

Author: fed1337

.dockerignore

@@ -9,3 +9,4 @@ lemur/static/dist
 node_modules
 bower_components
 .tmp
+migrations

Caddyfile

@@ -1,5 +1,4 @@
 :80 {
-    encode gzip zstd
     handle /api/* {
         reverse_proxy localhost:8000
     }

Dockerfile

@@ -35,6 +35,7 @@ RUN uv sync --frozen
 
 RUN npm install \
     && npm run build_static \
+    && node_modules/.bin/gulp package --urlContextPath="" \
     && rm -rf node_modules bower_components .tmp
 
 
@@ -45,9 +46,14 @@ ENV PATH="/opt/lemur/.venv/bin:${PATH}" \
     PYTHONDONTWRITEBYTECODE=1
 
 RUN apt update && apt upgrade -y && apt install -y --no-install-recommends \
-    curl \
-    libldap-2.5-0 \
-    make && \
+    debian-keyring debian-archive-keyring apt-transport-https curl libldap-2.5-0 make gnupg && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN curl -1sLf https://dl.cloudsmith.io/public/caddy/stable/gpg.key | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
+    curl -1sLf https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt | tee /etc/apt/sources.list.d/caddy-stable.list && \
+    chmod o+r /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
+    chmod o+r /etc/apt/sources.list.d/caddy-stable.list && \
+    apt update && apt install caddy && \
     rm -rf /var/lib/apt/lists/*
 
 # Create lemur user
@@ -63,8 +69,7 @@ RUN chmod +x /opt/lemur/entrypoint
 USER lemur
 
 # Expose port
-EXPOSE 8000
+EXPOSE 80
 
 # Default command
 ENTRYPOINT ["/opt/lemur/entrypoint"]
-CMD ["start"]

Dockerfile-src_old

@@ -33,8 +33,9 @@ make html
 The frontend is an AngularJS 1.x application that needs to be compiled:
 
 ```bash
-npm install              # Install dependencies
-npm run build_static     # Runs gulp build
+npm install                       # Install dependencies
+npm run build_static              # Runs gulp build
+gulp package --urlContextPath=""  # set correct path for proper URL generating to backend
 ```
 
 ## Build with Docker

Dockerfile_old

@@ -12,9 +12,10 @@ services:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U lemur" ]
-      interval: 10s
+      interval: 5s
       timeout: 5s
-      retries: 5
+      start_period: 5s
+      retries: 3
 
 #  redis:
 #    image: redis:8-alpine
@@ -27,19 +28,6 @@ services:
 #      timeout: 5s
 #      retries: 5
 
-#  caddy:
-#    image: caddy:2-alpine
-#    container_name: lemur-caddy
-#    depends_on:
-#      lemur:
-#        condition: service_healthy
-#    ports:
-#      - "80:80"
-#      - "443:443"
-#    volumes:
-#      - ./Caddyfile:/etc/caddy/Caddyfile:ro
-##      - ./lemur/static/dist:/opt/lemur/lemur/static/dist:ro
-
   lemur:
     build:
       context: .
@@ -52,14 +40,16 @@ services:
       LOG_FILE: "/opt/lemur/lemur.log"
       SQLALCHEMY_DATABASE_URI: "postgresql://lemur:lemur@postgres:5432/lemur"
       LEMUR_CONF: "/opt/lemur/lemur.conf.py"
+      LEMUR_INIT: "1"
+      LEMUR_PASSWORD: "lemur"
     ports:
-      - "8000:8000"
+      - "80:80"
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:8000/api/1/healthcheck" ]
-      interval: 15s
-      timeout: 10s
+      interval: 5s
+      timeout: 5s
+      start_period: 5s
       retries: 3
-      start_period: 30s
 
 volumes:
   postgres_data:

SETUP.md

@@ -1,37 +1,29 @@
 #!/usr/bin/env bash
 set -e
 
-echo "[entrypoint] Starting Lemur container..."
-
+echo "[supervisor] Starting Lemur container..."
 install -Dm644 /opt/lemur/lemur.conf.py /home/lemur/.lemur/lemur.conf.py
 
-# Detect whether DB was already initialized
-#if [ ! -f "/opt/lemur/.db_initialized" ]; then
-#    echo "[entrypoint] Initializing database..."
-#
-#    lemur db create || true
-#    lemur db init || true
-#    lemur db migrate
-#    lemur init -p password
-#
-#    touch /opt/lemur/.db_initialized
-#    echo "[entrypoint] DB initialization complete."
-#else
-#    echo "[entrypoint] DB already initialized; skipping."
-#fi
+cd /opt/lemur
+
+if [[ "$LEMUR_INIT" == "1" ]]; then
+    echo "[supervisor] Running Lemur Bootstrap"
+    .venv/bin/lemur db init
+    .venv/bin/lemur db migrate
+    .venv/bin/lemur init -p "$LEMUR_PASSWORD"
+fi
+
+echo "[supervisor] Running database migrations..."
+.venv/bin/lemur db upgrade || {
+    echo "[db] Migration failed; refusing to start app."
+    exit 1
+}
+
+echo "[supervisor] Starting Lemur server..."
+.venv/bin/lemur start -w 4 -b 0.0.0.0:8000 &
+LEMUR_PID=$!
+
+trap 'echo "[supervisor] Caught stop signal"; kill "$LEMUR_PID" "$CADDY_PID" 2>/dev/null || true' SIGTERM SIGINT
 
-# Interpret CMD
-case "$1" in
-  start)
-    echo "[entrypoint] Starting Lemur server..."
-    exec lemur start -w 4 -b 0.0.0.0:8000
-    ;;
-  migrate)
-    echo "[entrypoint] Running migrations..."
-    exec lemur db migrate
-    ;;
-  *)
-    echo "[entrypoint] Running custom command: $@"
-    exec "$@"
-    ;;
-esac
+echo "[supervisor] Starting Caddy (foreground)..."
+exec caddy run --config /opt/lemur/Caddyfile

compose.yml

@@ -54,14 +54,7 @@ def create_app(app_name=None, blueprints=None, config=None):
     if not app_name:
         app_name = __name__
 
-    app = Flask(app_name, static_folder='static/dist', static_url_path='')
-
-    @app.route('/')
-    @app.route('/<path:path>')
-    def index(path=None):
-        if path and path.startswith('api/'):
-            return "Not Found", 404
-        return app.send_static_file('index.html')
+    app = Flask(app_name)
 
     ctx = get_current_context(silent=True)