diff --git a/Dockerfile.production b/Dockerfile.production index 8201361..025393f 100644 --- a/Dockerfile.production +++ b/Dockerfile.production @@ -2,7 +2,7 @@ From registry.0xacab.org/georg/mat2-ci-images:debian -LABEL maintainer="Mat2-Web Co-Maintainer " +LABEL maintainer="Mat-Web Co-Maintainer " WORKDIR /var/www/mat2-web diff --git a/README.md b/README.md index f703c0a..3d6625f 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ repository: https://0xacab.org/jvoisin/mat2-web/container_registry ### Building the production image Build command: `docker build -f Dockerfile.production -t mat-web .` -Run it: `docker run -ti -p8181:8080 --security-opt=no-new-privileges --read-only --tmpfs=/tmp --tmpfs /tmpfs --tmpfs=/var/www/mat2-web/uploads mat-web:latest` +Run it: ` docker run -ti -p8181:8080 --security-opt=no-new-privileges --read-only --tmpfs /tmp --tmpfs=/var/www/mat2-web/uploads mat-web:latest` This does mount the upload folder as tmpfs and servers the app on `localhost:8181`. diff --git a/config/nginx-default.conf b/config/nginx-default.conf index 5abfe22..52c2fe2 100644 --- a/config/nginx-default.conf +++ b/config/nginx-default.conf @@ -9,6 +9,6 @@ server { location / { try_files $uri @yourapplication; } location @yourapplication { include uwsgi_params; - uwsgi_pass unix:/tmpfs/uwsgi.sock; + uwsgi_pass unix:/tmp/uwsgi.sock; } } diff --git a/config/nginx.conf b/config/nginx.conf index 385f28f..bd4770b 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,5 +1,5 @@ worker_processes auto; -pid /tmpfs/nginx.pid; +pid /tmp/nginx.pid; include /etc/nginx/modules-enabled/*.conf; events { @@ -13,6 +13,7 @@ http { # Basic Settings ## + sendfile on; tcp_nopush on; tcp_nodelay on; keepalive_timeout 65; diff --git a/config/uwsgi.config b/config/uwsgi.config index 93441ed..56e0508 100644 --- a/config/uwsgi.config +++ b/config/uwsgi.config @@ -13,7 +13,7 @@ gid = 101 harakiri = 30 die-on-term = true -socket = /tmpfs/uwsgi.sock +socket = /tmp/uwsgi.sock chmod-socket = 774 plugins = python3