Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-02-23 08:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "moved socket file and nginx pid to /tmpfs"

Browse Source 
This reverts commit 4731cf86b1a1a380235948cc82b2ee5fbd35f11d.
This commit is contained in:
Jan Friedli 2020-03-29 15:02:47 +02:00
parent acb6694f82
commit e69d97e7ed
No known key found for this signature in database
GPG Key ID: F945FA2FCA30549D
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.production
View File

@ -2,7 +2,7 @@
From registry.0xacab.org/georg/mat2-ci-images:debian
LABEL maintainer="Mat2-Web Co-Maintainer <jan.friedli@immerda.ch>"
LABEL maintainer="Mat-Web Co-Maintainer <jan.friedli@immerda.ch>"
WORKDIR /var/www/mat2-web

2
README.md
View File

@ -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`.

2
config/nginx-default.conf
View File

@ -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;
}
}

3
config/nginx.conf
View File

@ -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;

2
config/uwsgi.config
View File

@ -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