Merge pull request #422 from python-discord/get_rid_of_uwsgi

Get rid of UWSGI, replace with gunicorn

.dockerignore

@@ -15,11 +15,8 @@ pydis_site/apps/home/tests
 pydis_site/apps/staff/tests
 CHANGELOG.md
 CONTRIBUTING.md
-docker
-!docker/uwsgi.ini
-!docker/wheels
 docker-compose.yml
-Dockerfile.local
+Dockerfile
 docs
 htmlcov
 LICENSE

docker/Dockerfile → Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-slim
+FROM python:3.9-slim-buster
 
 # Allow service to handle stops gracefully
 STOPSIGNAL SIGQUIT

Pipfile

@@ -16,7 +16,7 @@ requests = "~=2.21"
 pygments = "~=2.3.1"
 wiki = "~=0.6.0"
 pyyaml = "~=5.1"
-pyuwsgi = {version = "~=2.0", sys_platform = "!='win32'"}
+gunicorn = "~=20.0.4"
 django-allauth = "~=0.41"
 sentry-sdk = "~=0.14"
 gitpython = "~=3.1.7"
@@ -38,7 +38,7 @@ pre-commit = "~=2.1"
 unittest-xml-reporting = "~=3.0"
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"
 
 [scripts]
 start = "python manage.py run --debug"

azure-pipelines.yml

@@ -15,7 +15,7 @@ jobs:
         displayName: 'Set Python Version'
         name: PythonVersion
         inputs:
-          versionSpec: '3.7.x'
+          versionSpec: '3.9.x'
           addToPath: true
 
       - task: DockerCompose@0

docker-compose.yml

@@ -24,7 +24,7 @@ services:
   web:
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: Dockerfile
     command: ["run", "--debug"]
     networks:
       default:
@@ -45,6 +45,7 @@ services:
       METRICITY_DB_URL: postgres://pysite:pysite@postgres:5432/metricity
       SECRET_KEY: suitable-for-development-only
       STATIC_ROOT: /var/www/static
+      DEBUG: 1
 
 volumes:
   staticfiles:

manage.py

@@ -7,10 +7,10 @@
 from typing import List
 
 import django
+import gunicorn.app.wsgiapp
 from django.contrib.auth import get_user_model
 from django.core.management import call_command, execute_from_command_line
 
-
 DEFAULT_ENVS = {
     "DJANGO_SETTINGS_MODULE": "pydis_site.settings",
     "SUPER_USERNAME": "admin",
@@ -156,10 +156,18 @@ def run_server(self) -> None:
             call_command("runserver", "0.0.0.0:8000")
             return
 
-        import pyuwsgi
-
-        # Run uwsgi for production server
-        pyuwsgi.run(["--ini", "docker/uwsgi.ini"])
+        # Patch the arguments for gunicorn
+        sys.argv = [
+            "gunicorn",
+            "--preload",
+            "-b", "0.0.0.0:8000",
+            "pydis_site.wsgi:application",
+            "--threads", "8",
+            "-w", "4"
+        ]
+
+        # Run gunicorn for the production server.
+        gunicorn.app.wsgiapp.run()
 
 
 def main() -> None: