Merge branch 'john-david3:main' into main

docker-compose.yml

@@ -7,11 +7,11 @@ services:
       - "1935:1935"  # RTMP
       - "8080:8080"
     depends_on:
-      - flask
+      - web_server
     networks:
       - app_network
 
-  flask:
+  web_server:
     build:
       context: ./web_server
     ports:
@@ -21,3 +21,4 @@ services:
 
 networks:
   app_network:
+    driver: bridge

nginx/nginx.conf

@@ -32,12 +32,14 @@ http {
                 application/vnd.apple.mpegurl m3u8;
                 video/mp2t ts;
             }
+        }
 
-            root /tmp;
-            add_header Cache-Control no-cache;
-            add_header Access-Control-Allow-Origin *;
-
-            autoindex on;  # Enable directory indexing
+        location / {
+            proxy_pass http://127.0.0.1:5000;  # flask-app is the name of the Flask container in docker-compose
+            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;
         }
     }
 }

web_server/Dockerfile

@@ -14,8 +14,5 @@ COPY . .
 ENV FLASK_APP=backend.blueprints.__init__
 ENV FLASK_DEBUG=True
 
-# Expose Flask's port
-EXPOSE 5000
-
 # Start the Flask app
-CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"]
+CMD ["gunicorn", "-b", "0.0.0.0:5000", "blueprints.__init__:create_app()"]

web_server/requirements.txt

@@ -20,3 +20,4 @@ typing_extensions==4.12.2
 urllib3==2.3.0
 Werkzeug==3.1.3
 WTForms==3.2.1
+Gunicorn==20.1.0