[DON'T MERGE YET] Add nginx config for X-Accel

docker-compose.yml

@@ -1,22 +1,32 @@
 version: '3'
 
 services:
+  nginx:
+    image: nginx:latest
+    restart: unless-stopped
+    ports:
+      - "9000:80"
+    volumes:
+      - ./nginx/conf.d:/etc/nginx/conf.d
+      - ./autograder-server/media_root_dev:/protected
+
   django:
     restart: unless-stopped
     build:
       context: ./autograder-server
       dockerfile: Dockerfile-django-dev
     container_name: typescript-cli-django
-    ports:
-      - "9000:9000"
     volumes:
       - ./autograder-server:/usr/src/app
-    command: >-
-      python3 manage.py runserver 0.0.0.0:9000
+    command: gunicorn --workers=1 autograder.wsgi:application --bind 0.0.0.0:8000 --error-logfile=- --access-logfile=-
 
     env_file:
       - ./autograder-server/_dev.env
     environment:
+      # This gives us an extra way of verifying that we have X-Accel set up
+      # correctly
+      USE_NGINX_X_ACCEL: 'true'
+
       # Set to false to disable real authentication. Any other string value
       # will enable real authentication.
       # Then, using a browser plugin such as EditThisCookie, set the

nginx/conf.d/default.conf

@@ -0,0 +1,30 @@
+# !!!!! DO NOT USE THIS CONFIG FILE IN PRODUCTION !!!!!
+
+
+# Redirect http requests to https
+server {
+    # Disable caching (otherwise we get some strange behavior because of
+    # the Docker volumes)
+    sendfile off;
+
+    # This should be the absolute path to media_root_dev. Used for
+    # X-Accel redirects.
+    location /protected {
+        internal;
+        root /;
+    }
+
+    location /api {
+        add_header Cache-Control "no-cache, no-store";
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_redirect off;
+
+        proxy_pass http://django:8000;
+
+        client_max_body_size 30M;
+        # Disable buffering so large file downloads don't get cut off
+        proxy_max_temp_file_size 0;
+    }
+}

package.json

@@ -3,7 +3,7 @@
   "version": "2.4.4",
   "description": "A client for interacting with the autograder.io API.",
   "scripts": {
-    "test": "tsc -p . --noEmit && jest --runInBand",
+    "test": "tsc -p . --noEmit && jest --runInBand -b",
     "lint": "tsc -p . --noEmit && tslint --project .",
     "build": "tsc -p ."
   },

tests/utils.ts

@@ -21,7 +21,7 @@ export function reset_db() {
     // Because of the overhead in flushing the database using manage.py flush,
     // we'll instead delete all objects in the "top-level" tables that all
     // the other data depends on.
-    let delete_data = `import shutil
+    let delete_data = `import subprocess
 from django.core.cache import cache;
 from django.contrib.auth.models import User
 from autograder.core.models import Course, SandboxDockerImage, BuildSandboxDockerImageTask
@@ -30,7 +30,7 @@ User.objects.all().delete()
 SandboxDockerImage.objects.exclude(name='default').delete()
 BuildSandboxDockerImageTask.objects.all().delete()
 
-shutil.rmtree('/usr/src/app/media_root_dev/', ignore_errors=True)
+subprocess.run('rm -r /usr/src/app/media_root_dev/*', shell=True)
 cache.clear()
 `;
     run_in_django_shell(delete_data);