From ac21ea756c18453954cdc87e9d33a9676ef48066 Mon Sep 17 00:00:00 2001 From: Jan Friedli Date: Sun, 29 Mar 2020 22:49:22 +0200 Subject: moved uwsgi.sock to /run/uwsgi --- README.md | 10 +--------- config/nginx-default.conf | 2 +- config/uwsgi.config | 2 +- 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 the uploads folder, to ensure that the uploaded files won't be recoverable between reboots. - -# Deploy using Docker -You can find the ready to run docker image here: -https://0xacab.org/jvoisin/mat2-web/container_registry - -Example: -`docker run -p 80:80 -d -e MAT2_ALLOW_ORIGIN_WHITELIST='https://myhost1.org' registry.0xacab.org/jvoisin/mat2-web:latest` - # Development Install docker and docker-compose and then run `docker-compose up` to setup the 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 ### 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=/var/www/mat2-web/uploads mat-web:latest` +Run it: `docker run -ti -p8181:8080 --read-only --tmpfs /tmp --tmpfs /run/uwsgi --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 52c2fe2..f4d8baa 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:/tmp/uwsgi.sock; + uwsgi_pass unix:/run/uwsgi/uwsgi.sock; } } 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 harakiri = 30 die-on-term = true -socket = /tmp/uwsgi.sock +socket = /run/uwsgi/uwsgi.sock chmod-socket = 774 plugins = python3 -- cgit v1.3