added cadvisor and nginx reverse proxy

Dockerfile

@@ -1,51 +1,95 @@
 FROM swaggerapi/swagger-ui:v4.18.2 AS swagger-ui
-FROM python:3.10-slim
+FROM nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu22.04
 
 ARG SERVICE_USER=service
 ARG SERVICE_UID=1000
 ARG SERVICE_GID=1000
-
+ENV PYTHON_VERSION=3.10
 ENV POETRY_VENV=/app/.venv
 
+# Install necessary tools, cAdvisor, and Nginx
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get -qq update \
     && apt-get -qq install --no-install-recommends \
-    lua5.3 \
-    lua5.4 \
-    lua-check \
-    fswatch \
-    make \
-    cargo \
-    ffmpeg \
-    redis \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-venv \
+        python3-pip \
+        lua5.3 \
+        lua5.4 \
+        lua-check \
+        fswatch \
+        make \
+        ffmpeg \
+        redis \
+        wget \
+        curl \
+        supervisor \
+        nginx \
+        net-tools \
     && rm -rf /var/lib/apt/lists/*
 
+# Set up Python symlinks
+RUN ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python3 && \
+    ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python && \
+    ln -s -f /usr/bin/pip3 /usr/bin/pip
+
+# Install cAdvisor
+RUN wget https://github.com/google/cadvisor/releases/download/v0.47.2/cadvisor-v0.47.2-linux-amd64 -O /usr/local/bin/cadvisor \
+    && chmod +x /usr/local/bin/cadvisor
+
+   
+# Set up service user
 RUN groupadd -g $SERVICE_GID $SERVICE_USER || true
-RUN useradd -u $SERVICE_UID -g $SERVICE_GID -d /app -s /usr/sbin/nologin $SERVICE_USER || true
+RUN useradd -u $SERVICE_UID -g $SERVICE_GID -d /app -s /bin/bash $SERVICE_USER || true
+
+# After installing cAdvisor
+RUN chown service:service /usr/local/bin/cadvisor
+
+# Set up directories and permissions
+RUN mkdir -p /app /var/log/nginx /var/lib/nginx /run/nginx && \
+    chown -R $SERVICE_USER:$SERVICE_USER /app /var/log/nginx /var/lib/nginx /run/nginx /var/log/supervisor
 
+# Copy application files
 COPY --chown=$SERVICE_UID:$SERVICE_GID . /app
 COPY --chown=$SERVICE_UID:$SERVICE_GID --from=swagger-ui /usr/share/nginx/html/swagger-ui.css /app/swagger-ui-assets/swagger-ui.css
 COPY --chown=$SERVICE_UID:$SERVICE_GID --from=swagger-ui /usr/share/nginx/html/swagger-ui-bundle.js /app/swagger-ui-assets/swagger-ui-bundle.js
-RUN chown $SERVICE_UID:$SERVICE_GID /app
 
-USER $SERVICE_USER
+# Copy Nginx configuration
+COPY nginx.conf /etc/nginx/nginx.conf
+# After installing Nginx
+RUN chown -R service:service /var/log/nginx /var/lib/nginx /run
+RUN chmod -R 755 /var/log/nginx /var/lib/nginx /run
+
+# Ensure Nginx can read its configuration
+RUN chmod 644 /etc/nginx/nginx.conf
 
+# Copy supervisord configuration
+COPY --chown=$SERVICE_UID:$SERVICE_GID supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Switch to service user
+USER $SERVICE_USER
 WORKDIR /app
 
+# Set up Python environment
 RUN python3 -m venv $POETRY_VENV \
     && $POETRY_VENV/bin/pip install -U pip setuptools \
     && $POETRY_VENV/bin/pip install poetry==1.6.1
 
 ENV PATH="${PATH}:${POETRY_VENV}/bin"
 
+COPY --chown=$SERVICE_UID:$SERVICE_GID poetry.lock pyproject.toml ./
 RUN poetry config virtualenvs.in-project true
+RUN poetry install --no-root
 RUN poetry install && rm -rf /app/.cache/pypoetry
+RUN $POETRY_VENV/bin/pip install --no-cache-dir torch==1.13.1+cu117 -f https://download.pytorch.org/whl/torch
 
 WORKDIR /app/reascripts/ReaSpeech
 RUN make publish
 WORKDIR /app
 RUN rm -rf reascripts
 
-ENTRYPOINT ["python3", "app/run.py"]
+# Expose single port for Nginx
+EXPOSE 7860
 
-EXPOSE 9000
+# Use supervisord to manage multiple processes
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

README.md

@@ -5,5 +5,5 @@ colorFrom: gray
 colorTo: yellow
 sdk: docker
 pinned: false
-app_port: 9000
+app_port: 7860
 ---

nginx.conf

@@ -0,0 +1,102 @@
+user service service;
+worker_processes auto;
+pid /tmp/nginx.pid;
+
+events {
+    worker_connections 768;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log /tmp/nginx_access.log;
+    error_log /tmp/nginx_error.log;
+    gzip on;
+
+    server {
+        listen 7860;
+        server_name localhost;
+
+        # Force inclusion of port in redirects
+        port_in_redirect on;
+        absolute_redirect off;
+
+        # Preserve original scheme (http or https)
+        set $origin_scheme $scheme;
+        if ($http_x_forwarded_proto = "https") {
+            set $origin_scheme "https";
+        }
+
+        # cAdvisor
+        location /cadvisor/ {
+            proxy_pass http://localhost:8080/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $origin_scheme;
+            proxy_read_timeout 90;
+            proxy_http_version 1.1;
+            proxy_redirect off;
+    
+            # Rewrite the URL to remove /cadvisor/ before passing to cAdvisor
+            rewrite ^/cadvisor/(.*) /$1 break;
+    
+            # Handle cAdvisor's redirect and resource paths
+            sub_filter_once off;
+            sub_filter 'href="../' 'href="/cadvisor/';
+            sub_filter 'src="../' 'src="/cadvisor/';
+            sub_filter 'url("../' 'url("/cadvisor/';
+            sub_filter 'action="../' 'action="/cadvisor/';
+            sub_filter '<a href="/' '<a href="/cadvisor/';
+        }
+    
+        # Handle the /containers/ redirect from cAdvisor
+        location /containers/ {
+            return 301 $origin_scheme://$host:$server_port/cadvisor/containers/;
+        }
+    
+        # Redirect /cadvisor to /cadvisor/
+        location = /cadvisor {
+            return 301 $origin_scheme://$host:$server_port/cadvisor/;
+        }
+
+        # Root location
+        location = / {
+            return 302 $origin_scheme://$http_host/reaspeech/;
+        }
+
+        # Main application
+        location /reaspeech {
+            proxy_pass http://localhost:9000;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $origin_scheme;
+        }
+
+        location /asr {
+            proxy_pass http://localhost:9000;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $origin_scheme;
+        }
+
+        location /jobs {
+            proxy_pass http://localhost:9000;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $origin_scheme;
+        }
+
+        location /static/ {
+            alias /app/app/static/;
+        }
+    }
+}

supervisord.conf

@@ -0,0 +1,41 @@
+[unix_http_server]
+file=/tmp/supervisor.sock
+chmod=0700
+chown=service:service
+
+[supervisord]
+logfile=/tmp/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=info
+pidfile=/tmp/supervisord.pid
+nodaemon=true
+user=service
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock
+
+[program:app]
+command=/app/.venv/bin/python /app/app/run.py
+user=service
+autostart=true
+autorestart=true
+
+[program:cadvisor]
+command=/usr/local/bin/cadvisor --port=8080 --allow_dynamic_housekeeping=false --listen_ip=0.0.0.0
+user=service
+autostart=true
+autorestart=true
+stdout_logfile=/tmp/cadvisor.log
+stderr_logfile=/tmp/cadvisor_err.log
+redirect_stderr=true
+
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+user=service
+autostart=true
+autorestart=true