wip

Dockerfile

@@ -1,15 +1,18 @@
 ARG MISTRAL_API_KEY
 ARG ELEVENLABS_API_KEY
-ARG API_URL=https://mistral-ai-game-jam-team15.hf.space/api
+ARG CUSTOM_API_URL=https://mistral-ai-game-jam-team15.hf.space/api
+ARG HOST=mistral-ai-game-jam-team15.hf.space
 ARG API_BASE_PATH=/app
 
 # Use Python base image as the primary environment
 FROM python:3.10-alpine AS final
 
-RUN apk add --no-cache supervisor
+RUN apk add --no-cache supervisor nginx
 
 RUN adduser -D -u 1000 user
-USER user
+RUN mkdir -p /home/user/nginx /home/user/nginx/tmp
+RUN chown -R user:user /home/user
+
 ENV HOME=/home/user \
 	PATH=/home/user/.local/bin:$PATH
 
@@ -23,12 +26,13 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY --chown=user ./src /app
 COPY --chown=user ./WebGLBuild /unity
 
-COPY --chown=user nginx.conf /etc/nginx/nginx.conf
+COPY nginx.conf /etc/nginx/nginx.conf
+
 
 # Expose the port
 EXPOSE 8080
 
-# Copy --chown=user supervisord config to manage both processes (Nginx & Uvicorn/Flask/etc.)
+# Copy supervisord config to manage both processes (Nginx & Uvicorn/Flask/etc.)
 COPY --chown=user supervisord.conf /etc/supervisord.conf
 
 # Start both services using supervisord

Makefile

@@ -1,17 +1,29 @@
+include .env
+export $(shell sed 's/=.*//' .env)
+
+
 build:
 	docker build -t team15:latest .
 
 run: # run source .env file for api keys
-	docker run  -p 8080:8080 -p 3000:3000 \
+	docker run  -p 8080:8080 \
 		-e MISTRAL_API_KEY=$(MISTRAL_API_KEY) \
 		-e ELEVENLABS_API_KEY=$(ELEVENLABS_API_KEY) \
-		-e API_URL=$(API_URL) \
+		-e CUSTOM_API_URL=$(CUSTOM_API_URL) \
+		--user=1000:1000 \
+		team15:latest
+
+run.dev:
+	docker run  -p 8080:8080 \
+		-e MISTRAL_API_KEY=$(MISTRAL_API_KEY) \
+		-e ELEVENLABS_API_KEY=$(ELEVENLABS_API_KEY) \
+		-e CUSTOM_API_URL=localhost:8080/api \
+		--user=1000:1000 \
 		team15:latest
 
 dev:
 	supervisord -c supervisord.dev.conf
 
-
 dev.api:
 	fastapi dev src/hackathon/server/server.py --host 0.0.0.0 --port 3000
 

WebGLBuild/Build/WebGLBuild.data

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:373d1d36d23b3822cee303c398adb63648c7046cb97889809ddeb2265a81fa41
-size 44337815
+oid sha256:db596f4f5ad6d90c5ea09fb0dd35e17f63382652dba2b86048ed56ec2dcbab34
+size 44342525

WebGLBuild/Build/WebGLBuild.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2330eb36a4bccf4fd39c9fcc39eaad380f82d3d40f670f649974779788126aff
-size 36937974
+oid sha256:ad46145c8de73bab6159f047a8a0a17aac5b10f4e5d2d270aa56045ffe136755
+size 36937944

nginx.conf

@@ -1,26 +1,57 @@
-server {
-    listen 8080;
 
-     location / {
+worker_processes  auto;
+
+error_log  /home/user/nginx/error.log warn;
+pid        /home/user/nginx/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    # Include the default mime types (includes .wasm, .js, etc.).
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    client_body_temp_path /home/user/nginx/tmp/client_body;
+    proxy_temp_path /home/user/nginx/tmp/proxy;
+    fastcgi_temp_path /home/user/nginx/tmp/fastcgi;
+    uwsgi_temp_path /home/user/nginx/tmp/uwsgi;
+    scgi_temp_path /home/user/nginx/tmp/scgi;
+
+    access_log /home/user/nginx/access.log;
+
+    # Hide nginx version
+    server_tokens off;
+
+    sendfile        on;
+    keepalive_timeout 65;
+
+    # The main server block
+    server {
+        listen 8080 default_server;
+        server_name _;
+
+        # Serve the Unity WebGL build from /unity at the container root
         root /unity;
         index index.html;
-        try_files $uri $uri/ /index.html;
-    }
 
-    location /api/ {
-        add_header Access-Control-Allow-Origin *;
-        add_header Access-Control-Allow-Methods "GET, POST, OPTIONS, DELETE, PUT, PATCH";
-        add_header Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization";
+        # Proxy /api/* to FastAPI running on localhost:3000
+        location /api/ {
+            proxy_pass         http://127.0.0.1:3000/;
+            proxy_http_version 1.1;
 
-        # Handle OPTIONS requests (pre-flight)
-        if ($request_method = 'OPTIONS') {
-            return 204;
+            # For WebSocket/streaming support (if your FastAPI endpoints use it)
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+
+            # Forward original Host header, useful for logs or domain-specific logic
+            proxy_set_header Host $host;
         }
 
-        proxy_pass http://127.0.0.1:3000/;
-        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 $scheme;
+        # All other files are served from the Unity build
+        # If file is not found, try returning index.html (useful for single-page apps)
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
     }
 }

supervisord.conf

@@ -5,8 +5,7 @@ logfile_maxbytes=0
 pidfile=/tmp/supervisord.pid
 
 [program:nginx]
-command=python3 -m http.server 8080
-directory=/unity
+command=/usr/sbin/nginx -g 'daemon off;'
 autostart=true
 autorestart=true
 stdout_logfile=/dev/stdout