Alexander Musikhin 11 сар өмнө
parent
commit
f427603c05

+ 2 - 2
Makefile

@@ -1,8 +1,8 @@
 # Environment section  -----------------------------------------------------
 
 ifneq (,$(wildcard ./.env))
-	include .env
-	$(eval export $(shell sed -ne 's/ *#.*$$//; /./ s/=.*$$// p' .env))
+        include .env
+        $(eval export $(shell sed -ne 's/ *#.*$$//; /./ s/=.*$$// p' .env))
 # Create frontend/.env file
 #    $(shell export WS_PORT=$(WS_PORT) ;\
 #            export WEB_PORT=$(WEB_PORT) ;\

+ 1 - 1
docker-compose.yml

@@ -58,7 +58,7 @@ services:
     ports:
       - ${WEB_PORT:-80}:80
     volumes:
-      - ./frontend:/var/frontend
+      - ./public:/var/frontend
       - ./:/var/www
       - ./docker/nginx/conf.d/:/etc/nginx/conf.d/
     networks:

+ 22 - 22
docker/nginx/conf.d/app.conf

@@ -17,30 +17,30 @@ server {
     }
 
 
-     location /files/ {
-       rewrite ^/files/(.*)$ /$1 break;
-       proxy_set_header X-Real-IP $remote_addr;
-       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-       proxy_set_header X-Forwarded-Proto $scheme;
-       proxy_set_header Host $http_host;
-
-       proxy_connect_timeout 300;
-       # Default is HTTP/1, keepalive is only enabled in HTTP/1.1
-       proxy_http_version 1.1;
-       proxy_set_header Connection "";
-       chunked_transfer_encoding off;
-
-       proxy_pass http://minio:9000;
-     }
+#      location /files/ {
+#        rewrite ^/files/(.*)$ /$1 break;
+#        proxy_set_header X-Real-IP $remote_addr;
+#        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#        proxy_set_header X-Forwarded-Proto $scheme;
+#        proxy_set_header Host $http_host;
+#
+#        proxy_connect_timeout 300;
+#        # Default is HTTP/1, keepalive is only enabled in HTTP/1.1
+#        proxy_http_version 1.1;
+#        proxy_set_header Connection "";
+#        chunked_transfer_encoding off;
+#
+#        proxy_pass http://minio:9000;
+#      }
 
     location / {
-      root   /var/frontend/dist;
-      index  index.html;
-      try_files $uri $uri/ /index.html;
+      root   /var/frontend;
+      index  index.php;
+      try_files $uri $uri/ /index.php;
     }
 
-    location /api {
-        try_files $uri $uri/ /index.php?$query_string;
-        gzip_static on;
-    }
+#     location /api {
+#         try_files $uri $uri/ /index.php?$query_string;
+#         gzip_static on;
+#     }
 }