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

This commit is contained in:
Langhammer, Jens 2019-10-04 12:45:19 +02:00
parent 1453008796
commit 1169db7530
6 changed files with 14 additions and 10 deletions

View File

@ -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

View File

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

9
docker/uwsgi.ini Normal file
View File

@ -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

View File

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

View File

@ -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