Merge pull request #46 from l0rb/master

nginx in docker

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.7-slim-buster
 
 RUN apt-get update && \
-    apt-get install -y git build-essential
+    apt-get install -y git build-essential nginx
 
 WORKDIR /
 
@@ -24,4 +24,9 @@ RUN \
 
 RUN python manage.py migrate
 
-CMD python manage.py runserver 0.0.0.0:8000
+RUN \
+    pip install uwsgi && \
+    ln -s /buzzword/buzzword_nginx.conf /etc/nginx/sites-enabled/
+
+#CMD python manage.py runserver 0.0.0.0:8000
+CMD service nginx start && uwsgi --ini /buzzword/uwsgi-docker.ini

buzzword_nginx.conf

@@ -0,0 +1,32 @@
+# buzzword_nginx.conf
+
+upstream django {
+    server unix:///buzzword/buzzword.sock;
+    # server 127.0.0.1:7999;
+}
+
+# configuration of the server
+server {
+    # the port your site will be served on
+    listen      8000;
+
+    # the domain name it will serve for
+    server_name 0.0.0.0; # substitute your machine's IP address or FQDN
+    charset     utf-8;
+
+    # max upload size
+    client_max_body_size 75M;   # adjust to taste
+
+    location /media  {
+        alias /buzzword/media;  # Django media files
+    }
+
+    location /static {
+        alias /buzzword/static; # Django static files
+    }
+
+    location / {
+        uwsgi_pass  django;
+        include     /buzzword/uwsgi_params;
+    }
+}

explorer/parts/helpers.py

@@ -239,7 +239,8 @@ def _get_initial_table(slug, config):
     corpus = _get_corpus(slug)
     default = dict(show="p", subcorpora="file")
     if "initial_table" in config:
-        default = json.loads(config["initial_table"])
+        if config["initial_table"]:  # `None` and empty string are not good defaults
+            default = json.loads(config["initial_table"])
     return corpus.table(**default)
 
 

uwsgi-docker.ini

@@ -0,0 +1,20 @@
+[uwsgi]
+socket = /buzzword/buzzword.sock
+
+uid = www-data
+gid = www-data
+
+master = true
+processes = 2
+
+chown-socket = www-data:www-data
+chmod-socket = 644
+
+#hook-master-start = unix_signal:15 gracefully_kill_them_all
+
+chdir = /buzzword
+module = buzzword.wsgi
+callable = application
+
+logto = /var/log/uwsgi.log
+

uwsgi_params

@@ -0,0 +1,17 @@
+
+uwsgi_param  QUERY_STRING       $query_string;
+uwsgi_param  REQUEST_METHOD     $request_method;
+uwsgi_param  CONTENT_TYPE       $content_type;
+uwsgi_param  CONTENT_LENGTH     $content_length;
+
+uwsgi_param  REQUEST_URI        $request_uri;
+uwsgi_param  PATH_INFO          $document_uri;
+uwsgi_param  DOCUMENT_ROOT      $document_root;
+uwsgi_param  SERVER_PROTOCOL    $server_protocol;
+uwsgi_param  REQUEST_SCHEME     $scheme;
+uwsgi_param  HTTPS              $https if_not_empty;
+
+uwsgi_param  REMOTE_ADDR        $remote_addr;
+uwsgi_param  REMOTE_PORT        $remote_port;
+uwsgi_param  SERVER_PORT        $server_port;
+uwsgi_param  SERVER_NAME        $server_name;