docker(minor): move docker-related files into separate folder

Dockerfile

@@ -1,7 +1,8 @@
-FROM docker.beryju.org/passbook/base:latest
+FROM docker.beryju.org/passbook/base:test
 
 COPY ./passbook/ /app/passbook
 COPY ./manage.py /app/
+COPY ./docker/uwsgi.ini /app/
 
 USER passbook
 

docker-compose.yml

@@ -40,10 +40,7 @@ services:
     image: docker.beryju.org/passbook/server:${TAG:-test}
     command:
       - uwsgi
-      - --http=0.0.0.0:8000
+      - uwsgi.ini
-      - --wsgi-file=passbook/root/wsgi.py
-      - --master
-      - --enable-threads
     environment:
       - PASSBOOK_REDIS__HOST=redis
       - PASSBOOK_POSTGRESQL__HOST=postgresql

docker/uwsgi.ini

@@ -0,0 +1,9 @@
+[uwsgi]
+http = 0.0.0.0:8000
+chdir = /app
+wsgi-file = passbook/root/wsgi.py
+processes = 4
+threads = 2
+enable-threads = true
+uid = passbook
+gid = passbook

helm/passbook/templates/web-deployment.yaml

@@ -56,10 +56,7 @@ spec:
           command:
             - uwsgi
           args:
-            - --http=0.0.0.0:8000
+            - uwsgi.ini
-            - --wsgi-file=passbook/root/wsgi.py
-            - --master
-            - --enable-threads
           envFrom:
             - configMapRef:
                 name: {{ include "passbook.fullname" . }}-config

static.Dockerfile

@@ -14,4 +14,4 @@ FROM nginx:latest
 
 COPY --from=static-build /app/static /data/static/
 COPY --from=static-build /app/static/robots.txt /data/robots.txt
-COPY ./passbook/core/nginx.conf /etc/nginx/nginx.conf
+COPY ./docker/nginx.conf /etc/nginx/nginx.conf