summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile.production2
-rw-r--r--README.md2
-rw-r--r--config/nginx-default.conf2
-rw-r--r--config/nginx.conf3
-rw-r--r--config/uwsgi.config2
5 files changed, 6 insertions, 5 deletions
diff --git a/Dockerfile.production b/Dockerfile.production
index 8201361..025393f 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -2,7 +2,7 @@
2 2
3From registry.0xacab.org/georg/mat2-ci-images:debian 3From registry.0xacab.org/georg/mat2-ci-images:debian
4 4
5LABEL maintainer="Mat2-Web Co-Maintainer <jan.friedli@immerda.ch>" 5LABEL maintainer="Mat-Web Co-Maintainer <jan.friedli@immerda.ch>"
6 6
7WORKDIR /var/www/mat2-web 7WORKDIR /var/www/mat2-web
8 8
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
205### Building the production image 205### Building the production image
206Build command: `docker build -f Dockerfile.production -t mat-web .` 206Build command: `docker build -f Dockerfile.production -t mat-web .`
207 207
208Run 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` 208Run it: ` docker run -ti -p8181:8080 --security-opt=no-new-privileges --read-only --tmpfs /tmp --tmpfs=/var/www/mat2-web/uploads mat-web:latest`
209 209
210This does mount the upload folder as tmpfs and servers the app on `localhost:8181`. 210This does mount the upload folder as tmpfs and servers the app on `localhost:8181`.
211 211
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 {
9 location / { try_files $uri @yourapplication; } 9 location / { try_files $uri @yourapplication; }
10 location @yourapplication { 10 location @yourapplication {
11 include uwsgi_params; 11 include uwsgi_params;
12 uwsgi_pass unix:/tmpfs/uwsgi.sock; 12 uwsgi_pass unix:/tmp/uwsgi.sock;
13 } 13 }
14} 14}
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 @@
1worker_processes auto; 1worker_processes auto;
2pid /tmpfs/nginx.pid; 2pid /tmp/nginx.pid;
3include /etc/nginx/modules-enabled/*.conf; 3include /etc/nginx/modules-enabled/*.conf;
4 4
5events { 5events {
@@ -13,6 +13,7 @@ http {
13 # Basic Settings 13 # Basic Settings
14 ## 14 ##
15 15
16 sendfile on;
16 tcp_nopush on; 17 tcp_nopush on;
17 tcp_nodelay on; 18 tcp_nodelay on;
18 keepalive_timeout 65; 19 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
13harakiri = 30 13harakiri = 30
14die-on-term = true 14die-on-term = true
15 15
16socket = /tmpfs/uwsgi.sock 16socket = /tmp/uwsgi.sock
17chmod-socket = 774 17chmod-socket = 774
18plugins = python3 18plugins = python3
19 19