去掉server代码快

command/Start.php

@@ -163,7 +163,6 @@ class Start
             system("cp -Rf /workspace/projects/docker-test {$directory}");
             system("cp -Rf /workspace/projects/proginn-user {$directory}");
             system("cp -Rf /workspace/projects/proginn-work {$directory}");
-            system("cp -Rf /workspace/projects/proginn-serve {$directory}");
             // 创建日志相关目录
             mkdir($directory . '/log/pm2', 0777, true); //
             mkdir($directory . '/log/proginn_cache', 0777, true); //

config/nginx/template/proginn.nginx.conf

@@ -199,7 +199,7 @@ server {
 
 
     location ^~ /sapi {
-        proxy_pass http://127.0.0.1:5002;
+        proxy_pass http://127.0.0.1:5000;
         proxy_set_header Host {{domain}}.test.proginn.com;
     }
 
@@ -577,34 +577,4 @@ server {
     }
 
     access_log /data/log/work_proginn_access.log proginn-logid;
-}
-
-
-# 工作模块
-server {
-    listen 5002;
-    server_name {{domain}}.test.proginn.com;
-
-    root /proginn-serve/public/;
-    index index.php index.html index.htm;
-
-
-    location / {
-        if (!-e $request_filename) {
-            rewrite  ^(.*)$  /index.php?s=$1  last;
-            break;
-        }
-    }
-    set $temp_request_id $http_x_request_id;
-    if ($temp_request_id = "") {
-        set $temp_request_id $request_id;
-    }
-
-    location ~ \.php$ {
-        fastcgi_pass unix:/var/run/php7-fpm.sock;
-        fastcgi_index index.php;
-        include fastcgi_params;
-    }
-
-    access_log /data/log/work_proginn_access.log proginn-logid;
 }

dockerfile/template.yml

@@ -10,7 +10,6 @@ services:
       - /workspace/containers/<containerName>/boss:/boss:rw
       - /workspace/containers/<containerName>/proginn-user:/proginn-user:rw
       - /workspace/containers/<containerName>/proginn-work:/proginn-work:rw
-      - /workspace/containers/<containerName>/proginn-serve:/proginn-serve:rw
       - /workspace/containers/<containerName>/proginn-frontend:/proginn-frontend:rw
       - /workspace/containers/<containerName>/festival:/festival:rw
       - /workspace/containers/<containerName>/log/:/var/log/nginx
@@ -23,7 +22,6 @@ services:
       - /var/www/.ssh:/var/www/.ssh:ro
       - /workspace/projects/docker-test/tp/.env:/proginn-user/.env:rw
       - /workspace/projects/docker-test/tp/.env:/proginn-work/.env:rw
-      - /workspace/projects/docker-test/tp/.env:/proginn-serve/.env:rw
     command: /data/docker/shell/container-up.sh
     networks:
       proginn:

shell/container-code-update.sh

@@ -7,8 +7,6 @@ cd /proginn-user && git fetch origin dev
 cd /proginn-user && git checkout -f origin/dev
 cd /proginn-work && git fetch origin dev
 cd /proginn-work && git checkout -f origin/dev
-cd /proginn-serve && git fetch origin dev
-cd /proginn-serve && git checkout -f origin/dev
 cd /boss && git fetch origin $ROOTER_BRANCH
 cd /boss && git checkout -f origin/$ROOTER_BRANCH
 cd /proginn-frontend && git fetch origin $PROGINN_FRONTEND_BRANCH

shell/container-up.sh

@@ -35,9 +35,6 @@ su -c "cd /proginn-user && git checkout -f origin/dev" -s /bin/bash - www-data
 chown -R www-data:www-data /proginn-work
 su -c "cd /proginn-work && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
 su -c "cd /proginn-work && git checkout -f origin/dev" -s /bin/bash - www-data
-chown -R www-data:www-data /proginn-serve
-su -c "cd /proginn-serve && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
-su -c "cd /proginn-serve && git checkout -f origin/dev" -s /bin/bash - www-data
 chown -R www-data:www-data /proginn-frontend
 su -c "cd /proginn-frontend && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
 su -c "cd /proginn-frontend && git checkout -f origin/$PROGINN_FRONTEND_BRANCH" -s /bin/bash - www-data