Ver código fonte

for docker compose

stanley-king 4 anos atrás
pai
commit
cc4a790ddb

+ 1 - 1
conf/nginx/nginx-debug-http.conf

@@ -77,7 +77,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   fpmsrv:9000;
+            fastcgi_pass   websrv:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 1 - 1
conf/nginx/nginx-debug-https.conf

@@ -87,7 +87,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   fpmsrv:9000;
+            fastcgi_pass   websrv:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 1 - 1
conf/nginx/nginx-prod-http.conf

@@ -77,7 +77,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   fpmsrv:9000;
+            fastcgi_pass   websrv:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 1 - 1
conf/nginx/nginx-prod-https.conf

@@ -86,7 +86,7 @@ http
         location ~ \.php$ {
             add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   fpmsrv:9000;
+            fastcgi_pass   websrv:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 1 - 1
conf/nginx/nginx-test-http.conf

@@ -77,7 +77,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   tfpmsrv:9000;
+            fastcgi_pass   twebsrv:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 3 - 3
docker-compose-dev.yml

@@ -13,7 +13,7 @@ services:
       - $PWD/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
     links:
       - mobilesrv
-      - fpmsrv
+      - websrv
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
 
@@ -44,7 +44,7 @@ services:
       - "redisrv"
       - "searcher"
 
-  fpmsrv:
+  websrv:
       image: php-fpm:alpine
       volumes:
         - $PWD/conf/etc/localtime:/etc/localtime:ro
@@ -112,5 +112,5 @@ services:
     container_name: "panda-php"
     depends_on:
       - "redisrv"
-      - "fpmsrv"
+      - "websrv"
       - "searcher"

+ 3 - 3
docker-compose-test.yml

@@ -13,7 +13,7 @@ services:
       - $PWD/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
     links:
       - tmobilesrv
-      - tfpmsrv
+      - twebsrv
     container_name: "xyztest-nginx"
     command: [nginx,'-g','daemon off;']
 
@@ -44,7 +44,7 @@ services:
       - "docker.hostip:172.17.0.1"
       - "eth.hostip:172.26.105.125"
 
-  tfpmsrv:
+  twebsrv:
     image: php-fpm:alpine
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
@@ -124,7 +124,7 @@ services:
     container_name: "xyztest-php"
     depends_on:
       - "tredisrv"
-      - "tfpmsrv"
+      - "twebsrv"
       - "tsearchsrv"
     extra_hosts:
       - "docker.hostip:172.17.0.1"

+ 3 - 5
docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - $PWD/conf/nginx/nginx-prod-https.conf:/etc/nginx/nginx.conf:ro
     links:
       - mobilesrv
-      - fpmsrv
+      - websrv
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
 
@@ -30,8 +30,6 @@ services:
 
   mobilesrv:
     image: php-zts-debug:7.3.18
-    ports:
-      - "9100:9100"
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
@@ -48,7 +46,7 @@ services:
       - "docker.hostip:172.17.0.1"
       - "eth.hostip:172.26.105.125"
 
-  fpmsrv:
+  websrv:
     image: php-fpm:alpine
     ports:
       - "9000:9000"
@@ -134,7 +132,7 @@ services:
     container_name: "panda-php"
     depends_on:
       - "redisrv"
-      - "fpmsrv"
+      - "websrv"
       - "SearchSrv"
     extra_hosts:
       - "docker.hostip:172.17.0.1"