first

.gitignore

@@ -2,12 +2,10 @@ storage/mysql/*
 storage/redis/*
 !storage/mysql/.gitkeep
 !storage/redis/.gitkeep
-vue/*
-!vue/.gitkeep
 laravel/*
 !laravel/.gitkeep
-gulp/*
-!gulp/.gitkeep
+web/*
+!web/.gitkeep
 .c9/
 .idea/
 id_rsa

c9.conf

-server {
-    listen 80;
-    server_name c9.test;
-
-    access_log off;
-    
-    location / {
-        proxy_pass http://localhost:8181/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-}

html.conf → config/nginx/html.conf

+#promotion vue:npm run dev
 server {
     listen 80;
     server_name piston.test;
-    
-    location / {
-        proxy_pass http://localhost:3000/;
-    }
-}
-server {
-    listen 80;
-    server_name piston.build.test;
-    root /workspace/gulp/piston/dist;
+    root /web/piston/dist;
 
     index index.html index.htm index.php;
 
@@ -38,11 +31,11 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php5.6-fpm.sock;
+        fastcgi_pass     php56:9000;
         fastcgi_index    index.php;
+        fastcgi_param    SCRIPT_FILENAME /topka/public/$fastcgi_script_name;
         include          fastcgi_params;
     }
-
     location ~ /\.ht {
         deny all;
     }
@@ -50,7 +43,7 @@ server {
 server {
     listen 80;
     server_name vue.dealer.test;
-    root /workspace/vue/dealer/dist;
+    root /web/dealer/dist;
 
     index index.html;
 
@@ -96,8 +89,8 @@ server {
         listen 80;
         listen 443;
         server_name layui.test;
-        root /workspace/vue/layui-agent/start;
-        #root /data/git/piston/dist;
+        root /web/layui-agent/start;
+
         index index.html index.htm;
 
         access_log      /var/log/nginx/layui-agent.access.log;
@@ -111,11 +104,11 @@ server {
 
         
         location /src/ {
-                alias /workspace/vue/layui-agent/src/;
+                alias /web/layui-agent/src/;
         }
 
         location /dist/ {
-                alias /workspace/vue/layui-agent/dist/;
+                alias /web/layui-agent/dist/;
         }
 
         location /master/ {
@@ -125,25 +118,10 @@ server {
 
 server {
     listen 80;
-        server_name promotion.build.test;
-        root /workspace/vue/promotion/dist;
-        index index.html;
-
-        access_log      /var/log/nginx/promotion.build.access.log;
-        error_log       /var/log/nginx/promotion.build.error.log;
-
-        location / {
-            try_files $uri /index.html?$query_string;
-        }
-}
-
-
-server {
-        listen 80;
     listen 443;
     server_name provider.test;
-        root /workspace/vue/layui-provider/start;
-        #root /data/git/piston/dist;
+    root /web/layui-provider/start;
+
     index index.html index.htm;
 
     access_log      /var/log/nginx/layui-agent.access.log;
@@ -157,11 +135,11 @@ server {
 
     
     location /src/ {
-                alias /workspace/vue/layui-provider/src/;
+            alias /web/layui-provider/src/;
     }
 
     location /dist/ {
-                alias /workspace/vue/layui-provider/dist/;
+            alias /web/layui-provider/dist/;
     }
 
     location /provider/ {

php.conf → config/nginx/php.conf

 server {
     listen 80;
     server_name dealer.test;
-    root /workspace/laravel/dealer/public;
 
     add_header X-Frame-Options "SAMEORIGIN";
     add_header X-Content-Type-Options "nosniff";
@@ -20,8 +19,8 @@ server {
     error_page 404 /index.php;
 
     location ~ \.php$ {
-        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_pass php71:9000;
+        fastcgi_param SCRIPT_FILENAME /dealer/public/$fastcgi_script_name;
         include fastcgi_params;
     }
 
@@ -33,7 +32,8 @@ server {
 server {
     listen 80;
     server_name promotion.test;
-    root /workspace/laravel/promotion/public;
+    root /laravel/promotion/public;
+    client_max_body_size 1024m;
 
     add_header X-Frame-Options "SAMEORIGIN";
     add_header X-Content-Type-Options "nosniff";
@@ -52,8 +52,8 @@ server {
     error_page 404 /index.php;
 
     location ~ \.php$ {
-        fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_pass php71:9000;
+        fastcgi_param SCRIPT_FILENAME /promotion/public/$fastcgi_script_name;
         include fastcgi_params;
     }
 
@@ -66,7 +66,7 @@ server {
     listen                  80;
     keepalive_timeout       60;
     server_name             sosocar.test;
-    root                    /workspace/laravel/topka/public;
+    root                    /laravel/topka/public;
 
 	location / {
         if (!-e $request_filename) {
@@ -89,9 +89,9 @@ server {
         proxy_pass http://api.sosocar.cn;
     }
     location ~ \.php$ {
-        fastcgi_pass     unix:/var/run/php/php5.6-fpm.sock;
+        fastcgi_pass     php56:9000;
         fastcgi_index    index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME /topka/public/$fastcgi_script_name;
         include          fastcgi_params;
     }
 }

docker-compose.yml

@@ -2,58 +2,77 @@ version: '3.5'
 
 services:
 
-  workspace:
-    container_name: workspace
-    image: cnice/4wheels-devops:1.0.4
-    networks:
-      - wb_net
+  nginx:
+    image: nginx:alpine
+    restart: always
+    volumes: 
+      - ./config/nginx:/etc/nginx/conf.d
+      - ./logs/nginx:/var/log/nginx
+      - ./web:/web
+      - ./laravel:/laravel
     ports: 
       - 80:80
+      - 443:443
+
+  php56:
+    image: cnice/4wheels-php56:latest
+    restart: always
+    volumes:
+      - './laravel/topka:/topka'
+    hostname: local
+    links:
+      - dbm
+      - dbr
+      - memcached
+      - beanstalkd
+
+  php71:
+    image: cnice/4wheels-php71:latest
+    restart: always
     volumes:
-      - '.:/workspace'
+      - './laravel/dealer:/dealer'
+      - './laravel/promotion:/promotion'
     hostname: local
+    links:
+      - dbm
+      - dbr
+      - memcached
+      - beanstalkd
 
-  mysql.test:
-    container_name: mysql
+  dbm:
     image: mysql:5.5
-    networks:
-      - wb_net
+    restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: root
+      MYSQL_ROOT_PASSWORD: topka2012
     volumes:
       - './storage/mysql:/var/lib/mysql'
-      # - './my.cnf:/etc/mysql/my.cnf'
     ports:
       - 3306:3306
-    hostname: mysql
 
-  redis.test:
-    container_name: redis
+  dbr:
     image: redis:alpine
-    networks:
-      - wb_net
     volumes:
       - './storage/redis:/data'
+    restart: always
     ports:
       - 6379:6379
-    command: redis-server --appendonly yes
-    hostname: redis
+    command: redis-server --requirepass topka2012 --appendonly yes
 
   dns:
-    container_name: dns
     image: jpillora/dnsmasq
-    networks:
-      - wb_net
+    restart: always
     ports:
       - 53:53/udp
       - 5380:8080
     volumes:
-      - './dns/dnsmasq.conf:/etc/dnsmasq.conf'
-
-networks:
-  wb_net:
-    name: wb_net
-    ipam:
-      driver: default
-      config:
-        - subnet: "172.29.233.0/24"
+      - './config/dns/dnsmasq.conf:/etc/dnsmasq.conf'
+  memcached: 
+    image: memcached:alpine3.14
+    restart: always
+    ports:
+      - 11211:11211
+  beanstalkd: 
+    image: schickling/beanstalkd
+    restart: always
+    ports:
+      - 11300:11300

logs/.gitignore

+nginx/*
+!nginx/.gitkeep
\ No newline at end of file

my.cnf

-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-#
-# The MySQL  Server configuration file.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-[mysqld]
-pid-file        = /var/run/mysqld/mysqld.pid
-socket          = /var/run/mysqld/mysqld.sock
-datadir         = /var/lib/mysql
-secure-file-priv= NULL
-
-default_authentication_plugin=mysql_native_password
-
-
-# Custom config should go here
-!includedir /etc/mysql/conf.d/