Merge branch 'master' of www.gitinn.com:proginn/docker-test

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;
-}
+}

dockerfile/common.yml

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

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"

shell/container-code-update.sh

@@ -11,6 +11,6 @@ cd /proginn-frontend && current_git_branch_latest_id=`git rev-parse HEAD`
 current_git_branch_last_id=`cat /var/www/.proginn-frontend-commit-id`
 if [[ "$current_git_branch_latest_id" != "$current_git_branch_last_id" ]]; then
     echo "$current_git_branch_latest_id" > /var/www/.proginn-frontend-commit-id
-    cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install && npm run build
-    cd /proginn-frontend && pm2 delete all && pm2 start npm --name proginn-frontend -- run start
-fi
+    cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install && npm run build_dev
+    cd /proginn-frontend && pm2 delete all && pm2 start npm --name proginn-frontend -- run start_dev
+fi

shell/container-up.sh

@@ -78,10 +78,10 @@ service php7.2-fpm start
 service nginx start
 cd /proginn-frontend
 chown -R www-data:www-data .
-su -c "cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install && npm run build" -s /bin/bash - www-data
-su -c "cd /proginn-frontend && pm2 start npm --name proginn-frontend -- run start" -s /bin/bash - www-data
+su -c "cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install && npm run build_dev" -s /bin/bash - www-data
+su -c "cd /proginn-frontend && pm2 start npm --name proginn-frontend -- run start_dev" -s /bin/bash - www-data
 
 # 启动定时脚本
 service cron restart
 
-tail -f /dev/null
+tail -f /dev/null