Update Dockerfile

Dockerfile

@@ -2,23 +2,31 @@ FROM python:3.10
 
 USER 0:0
 
-ENV PYTHONPATH="$PYTHONPATH:/root/server:/tools/efselab"
+ENV PYTHONPATH="$PYTHONPATH:/root:/root/server:/root/tools/efselab"
+ENV PATH="$PATH:/root:/root/server:/root/tools:/root/tools/efselab"
 ENV SWEGRAM_WORKSPACE=/root
 ENV PRODUCTION=1
 
 # Python packages
-RUN ln -s /usr/bin/python3.10 /usr/bin/python
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1 
 
-COPY tools/ /tools
+COPY build_dependencies /root/build_dependencies
 COPY server/ /root/server
-COPY run_server.py /root
+COPY app_run.py /root
 
 COPY requirements.server.txt /requirements.txt
 
-RUN pip install -r /requirements.txt --index-url https://pypi.org/simple
+# Entry python script to run app
+COPY main.py /root
 
 WORKDIR /root
+RUN python -m venv venv && \
+    . venv/bin/activate && \
+    pip install -r /requirements.txt --index-url https://pypi.org/simple && \
+    deactivate
 
-ENTRYPOINT [ "uvicorn", "run_server:app", "--reload" ]
+RUN . venv/bin/activate && swegram-build && deactivate
+RUN rm -rf build_dependencies requirements.txt
+
+ENTRYPOINT [ "bash", "-c", "source venv/bin/activate && python main.py" ]

run_server.py → app_run.py

@@ -28,3 +28,9 @@
 app.include_router(states_router, prefix=f"{PROD_PREFIX}/states", tags=["states"], dependencies=[Depends(get_db)])
 app.include_router(text_router, prefix=f"{PROD_PREFIX}/text", tags=["text"], dependencies=[Depends(get_db)])
 app.include_router(texts_router, prefix=f"{PROD_PREFIX}/texts", tags=["texts"], dependencies=[Depends(get_db)])
+
+
+if __name__ == "__main__":
+    import uvicorn
+
+    uvicorn.run(app, host="0.0.0.0", port=8000)

docker-compose.yml

@@ -23,16 +23,16 @@ services:
       - client
 
 
-  backend:
-    image: swegram-backend:latest  # Image needs to be built with network
-    container_name: fastapi-backend
-    restart: always
-    privileged: true
-    network_mode: host
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    profiles:
-      - client
+  # backend:
+  #   image: swegram-backend:latest  # Image needs to be built with network
+  #   container_name: swegram-backend-fastapi
+  #   restart: always
+  #   privileged: true
+  #   network_mode: host
+  #   volumes:
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #   profiles:
+  #     - client
 
 
   vue-nginx-proxy:
@@ -45,10 +45,3 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     profiles:
       - client
-
-
-
-
-
-
-

frontend/nginx.conf

@@ -18,4 +18,8 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
+
+    # Disable keepalive connections
+    keepalive_timeout 0;
+
 }

main.py

@@ -0,0 +1,15 @@
+import logging
+import os
+import subprocess
+from time import sleep
+
+if __name__ == "__main__":
+
+    os.environ["PRODUCTION"] = "1"
+    sleep(20)
+    while True:
+        try:
+            subprocess.run(["gunicorn", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "app_run:app"])
+        except Exception as error:
+            logging.error(error)
+            sleep(5)

requirements.server.txt

@@ -2,6 +2,7 @@ swegram
 cryptography
 fastapi
 uvicorn
+gunicorn
 databases[mysql]
 mysql-connector-python
 mysqlclient