diff options
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | docker/app/alpine/3.6/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/app/alpine/3.7/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/app/stretch/3.6/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/app/stretch/3.7/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/app/uwsgi.ini | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
7 files changed, 11 insertions, 6 deletions
diff --git a/.dockerignore b/.dockerignore index 26638546..55fb0e6d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -19,6 +19,7 @@ api/tests.py CHANGELOG.md CONTRIBUTING.md docker +!docker/app/uwsgi.ini docker-compose.yml Dockerfile docs diff --git a/docker/app/alpine/3.6/Dockerfile b/docker/app/alpine/3.6/Dockerfile index b610d410..8067adbd 100644 --- a/docker/app/alpine/3.6/Dockerfile +++ b/docker/app/alpine/3.6/Dockerfile @@ -4,6 +4,7 @@ ARG EXTRAS=deploy RUN apk add --no-cache --virtual build \ gcc \ + linux-headers \ musl-dev \ && \ apk add --no-cache \ @@ -17,5 +18,4 @@ RUN apk del --purge build COPY . . -HEALTHCHECK CMD curl -I -f localhost:4000 -CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] +CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/alpine/3.7/Dockerfile b/docker/app/alpine/3.7/Dockerfile index e52c526c..524d0bfa 100644 --- a/docker/app/alpine/3.7/Dockerfile +++ b/docker/app/alpine/3.7/Dockerfile @@ -4,6 +4,7 @@ ARG EXTRAS=deploy RUN apk add --no-cache --virtual build \ gcc \ + linux-headers \ musl-dev \ && \ apk add --no-cache \ @@ -17,4 +18,4 @@ RUN apk del --purge build COPY . . -CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] +CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/stretch/3.6/Dockerfile b/docker/app/stretch/3.6/Dockerfile index 0e840899..07911778 100644 --- a/docker/app/stretch/3.6/Dockerfile +++ b/docker/app/stretch/3.6/Dockerfile @@ -23,4 +23,4 @@ RUN apt-get purge -y \ libc-dev \ libpq-dev -CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] +CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/stretch/3.7/Dockerfile b/docker/app/stretch/3.7/Dockerfile index 0d4a9f3e..35ed5cfd 100644 --- a/docker/app/stretch/3.7/Dockerfile +++ b/docker/app/stretch/3.7/Dockerfile @@ -23,4 +23,4 @@ RUN apt-get purge -y \ libc-dev \ libpq-dev -CMD ["gunicorn", "--workers", "4", "--bind", "0.0.0.0:4000", "pysite.wsgi:application"] +CMD ["uwsgi", "--ini", "docker/app/uwsgi.ini"] diff --git a/docker/app/uwsgi.ini b/docker/app/uwsgi.ini new file mode 100644 index 00000000..f4160a9a --- /dev/null +++ b/docker/app/uwsgi.ini @@ -0,0 +1,3 @@ +[uwsgi] +http = :9090 +wsgi = pysite.wsgi:application @@ -23,7 +23,7 @@ setup( ], extras_require={ 'deploy': [ - 'gunicorn>=19.9.0', + 'uwsgi>=2.0.17.1' ], 'lint': [ 'flake8>=3.5.0', |