refactor debian image, some permisson settings

prod
Dmitriy Shesterkin 9 years ago
parent 1944964a49
commit 0a6ba5738f
  1. 7
      Dockerfile
  2. 8
      conf/nginx.conf
  3. 2
      src/docs/views/base_views.py

@ -10,8 +10,8 @@ ENV NGINX_VERSION="1.13.2" \
--pid-path=/var/run/nginx.pid \ --pid-path=/var/run/nginx.pid \
--http-log-path=/var/log/nginx/access.log \ --http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \ --error-log-path=/var/log/nginx/error.log \
--user=nginx \ --user=www-data \
--group=nginx \ --group=www-data \
--add-module=/tmp/modules/nginx_requestid-master" --add-module=/tmp/modules/nginx_requestid-master"
COPY requirements /opt/app/requirements COPY requirements /opt/app/requirements
@ -25,9 +25,6 @@ RUN apt-get update -y && \
make && \ make && \
apt-get clean && \ apt-get clean && \
# Add nginx group and user
addgroup -S nginx && \
adduser -S nginx -G nginx && \
# Download additional nginx modules # Download additional nginx modules
mkdir -p /tmp/modules && \ mkdir -p /tmp/modules && \
cd /tmp/modules && \ cd /tmp/modules && \

@ -1,6 +1,6 @@
worker_processes 1; worker_processes 1;
user nginx; user www-data;
pid /var/run/nginx.pid; pid /var/run/nginx.pid;
error_log /var/log/nginx/error.log; error_log /var/log/nginx/error.log;
@ -39,6 +39,12 @@ http {
expires 30d; expires 30d;
} }
location /favicon.ico {
alias /opt/app/public/static/favicon.ico;
expires 30d;
}
location / { location / {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

@ -417,7 +417,7 @@ class BaseViews(object):
tmp_dir = tempfile.mkdtemp(dir=tmp_media_dir) tmp_dir = tempfile.mkdtemp(dir=tmp_media_dir)
if not settings.DEBUG: if not settings.DEBUG:
os.chmod(tmp_dir, 755) # os.chmod(tmp_dir, 755)
GHOSTSCRIPTCMD = '/usr/bin/gs' GHOSTSCRIPTCMD = '/usr/bin/gs'
tmp_dirname = os.path.split(tmp_dir)[1] tmp_dirname = os.path.split(tmp_dir)[1]

Loading…
Cancel
Save