From 744786307823b5926561b86a89085e3a9c525de7 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey@cvat.ai>
Date: Fri, 26 May 2023 15:34:10 +0300
Subject: [PATCH] apply comments

---
 Dockerfile      |  2 --
 cvat/nginx.conf | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5cb1b5d22a9f..974aab6eb888 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -162,8 +162,6 @@ RUN --mount=type=bind,from=build-image,source=/tmp/wheelhouse,target=/mnt/wheelh
 ENV NUMPROCS=1
 COPY --from=build-image-av /opt/ffmpeg/lib /usr/lib
 
-RUN chown -R ${USER} /var/lib/nginx /var/log/nginx
-
 # These variables are required for supervisord substitutions in files
 # This library allows remote python debugging with VS Code
 ARG CVAT_DEBUG_ENABLED
diff --git a/cvat/nginx.conf b/cvat/nginx.conf
index 25aa69e82f70..9e75cc04c707 100644
--- a/cvat/nginx.conf
+++ b/cvat/nginx.conf
@@ -6,6 +6,8 @@ events {
   worker_connections 512;
 }
 
+error_log /home/django/logs/nginx_error.log;
+
 http {
 
   ##
@@ -19,12 +21,21 @@ http {
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
 
+  ##
+  # Override default tmp paths to be run nginx from non-root user
+  ##
+
+  proxy_temp_path    /tmp/nginx_proxy;
+  uwsgi_temp_path    /tmp/nginx_uwsgi;
+  scgi_temp_path     /tmp/nginx_scgi;
+  fastcgi_temp_path  /tmp/nginx_fastcgi;
+  client_body_temp_path /tmp/nginx_body;
+
   ##
   # Logging Settings
   ##
 
   access_log /home/django/logs/nginx_access.log;
-  error_log /home/django/logs/nginx_error.log;
 
   ##
   # CVAT Settings
@@ -42,7 +53,6 @@ http {
       gzip_comp_level 6;
       gzip_http_version 1.1;
       gzip_types
-          text/html
           application/javascript
           application/x-javascript
           text/javascript