Pārlūkot izejas kodu

fix: set environments

Acathur 5 gadi atpakaļ
vecāks
revīzija
238970f5e8

+ 7 - 7
config/nginx/template/proginn.nginx.conf

@@ -81,11 +81,11 @@ server {
     server_name {{domain}}.test-kaifain.proginn.com;
     root /proginn-frontend/dist/;
     index index.html;
-    
+
     rewrite ^/s/([a-z0-9]+)$ /kaifain/s/$1 last;
     rewrite ^/d/([a-z0-9]+)$ /kaifain/case/$1 last;
-    rewrite ^/c/([a-z0-9]+)$ /kaifain/$1 last;
-    
+    rewrite ^/c/([a-z0-9]+)$ /kaifain/c/$1 last;
+
     location / {
         if (!-e $request_filename) {
             rewrite  ^(.*)$  /kaifain$1  last;
@@ -138,9 +138,9 @@ server {
     server_name {{domain}}.test-job.proginn.com;
     root /proginn-frontend/dist/;
     index index.html;
-    
+
     rewrite ^/d/([a-z0-9]+)$ /job/detail/$1 last;
-    
+
     location / {
         if (!-e $request_filename) {
             rewrite  ^(.*)$  /job$1  last;
@@ -191,7 +191,7 @@ server {
 server {
     listen 80;
     server_name {{domain}}.test.proginn.com;
-    
+
     root /code/web/;
     index index.php index.html index.htm;
 
@@ -400,4 +400,4 @@ server {
         proxy_set_header Host {{domain}}.test.proginn.com;
     }
     access_log /data/log/festival.log proginn-logid;
-}
+}

+ 1 - 0
dockerfile/common.yml

@@ -89,6 +89,7 @@ services:
       - PROGINN_FRONTEND_BRANCH=dev
       - HOSTNAME=proginnScript
       - ENV=test
+      - NODE_ENV=development
 networks:
   proginn:
     external: true

+ 1 - 0
dockerfile/template.yml

@@ -31,6 +31,7 @@ services:
       - PROGINN_FRONTEND_BRANCH=<proginn-frontend-branch>
       - HOSTNAME=<fullDomain>
       - ENV=test
+      - NODE_ENV=development
     extra_hosts:
       - "<domain>.test.proginn.com:172.17.255.24"
       - "<domain>.test-rooter.proginn.com:172.17.255.24"