summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md10
-rw-r--r--config/nginx-default.conf2
-rw-r--r--config/uwsgi.config2
3 files changed, 3 insertions, 11 deletions
diff --git a/README.md b/README.md
index 3d6625f..071f216 100644
--- a/README.md
+++ b/README.md
@@ -84,14 +84,6 @@ collector cronjob to remove leftover files. Besides, it can create a
84the uploads folder, to ensure that the uploaded files won't be recoverable 84the uploads folder, to ensure that the uploaded files won't be recoverable
85between reboots. 85between reboots.
86 86
87
88# Deploy using Docker
89You can find the ready to run docker image here:
90https://0xacab.org/jvoisin/mat2-web/container_registry
91
92Example:
93`docker run -p 80:80 -d -e MAT2_ALLOW_ORIGIN_WHITELIST='https://myhost1.org' registry.0xacab.org/jvoisin/mat2-web:latest`
94
95# Development 87# Development
96Install docker and docker-compose and then run `docker-compose up` to setup 88Install docker and docker-compose and then run `docker-compose up` to setup
97the docker dev environment. Mat2-web is now accessible on your host machine at `localhost:5000`. 89the docker dev environment. Mat2-web is now accessible on your host machine at `localhost:5000`.
@@ -205,7 +197,7 @@ repository: https://0xacab.org/jvoisin/mat2-web/container_registry
205### Building the production image 197### Building the production image
206Build command: `docker build -f Dockerfile.production -t mat-web .` 198Build command: `docker build -f Dockerfile.production -t mat-web .`
207 199
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` 200Run it: `docker run -ti -p8181:8080 --read-only --tmpfs /tmp --tmpfs /run/uwsgi --tmpfs=/var/www/mat2-web/uploads mat-web:latest`
209 201
210This does mount the upload folder as tmpfs and servers the app on `localhost:8181`. 202This does mount the upload folder as tmpfs and servers the app on `localhost:8181`.
211 203
diff --git a/config/nginx-default.conf b/config/nginx-default.conf
index 52c2fe2..f4d8baa 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:/tmp/uwsgi.sock; 12 uwsgi_pass unix:/run/uwsgi/uwsgi.sock;
13 } 13 }
14} 14}
diff --git a/config/uwsgi.config b/config/uwsgi.config
index 56e0508..05dd9c1 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 = /tmp/uwsgi.sock 16socket = /run/uwsgi/uwsgi.sock
17chmod-socket = 774 17chmod-socket = 774
18plugins = python3 18plugins = python3
19 19