Merge branch 'osm' of github.com:jumpserver/docker-web into osm

Author: ibuler

Dockerfile

@@ -14,6 +14,7 @@ ARG TOOLS="                           \
         curl                          \
         apache2-utils                 \
         vim                           \
+        logrotate                     \
         "
 
 RUN set -ex \

includes/chen.conf

@@ -1,5 +1,6 @@
 location /chen/ {
-    proxy_pass http://chen:8082;
+    set $chen_upstream chen:8082;
+    proxy_pass http://$chen_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;

includes/common.conf

@@ -17,7 +17,7 @@
 
     location /web/health/ {
         access_log off;
-        add_header Content-Type 'application/json';
+        default_type application/json;
         return 200 '{"status": "ok"}';
     }
 

includes/core.conf

@@ -8,7 +8,8 @@ location /private-media/ {
 }
 
 location /ws/ {
-    proxy_pass http://core:8080;
+    set $core_upstream core:8080;
+    proxy_pass http://$core_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
@@ -18,7 +19,8 @@ location /ws/ {
 }
 
 location ~ ^/(core|api|media)/ {
-    proxy_pass http://core:8080;
+    set $core_upstream core:8080;
+    proxy_pass http://$core_upstream;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_ignore_client_abort on;

includes/koko.conf

@@ -1,5 +1,6 @@
 location /koko/ {
-    proxy_pass http://koko:5000;
+    set $koko_upstream koko:5000;
+    proxy_pass http://$koko_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;

includes/lion.conf

@@ -1,5 +1,6 @@
 location /lion/ {
-    proxy_pass http://lion:8081;
+    set $lion_upstream lion:8081;
+    proxy_pass http://$lion_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;

nginx.conf

@@ -25,6 +25,8 @@ stream {
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
+    resolver 127.0.0.11 valid=10s ipv6=off;
+    resolver_timeout 5s;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '