Browse Source

fix docker ports and php process tools

zouxuan 4 weeks ago
parent
commit
0f8cd9df76

+ 2 - 2
docker-compose/docker-compose.yml

@@ -60,8 +60,8 @@ services:
       TZ: Asia/Shanghai
       TZ: Asia/Shanghai
     ports:
     ports:
       - 9000:9000
       - 9000:9000
-      - 20002:20002
-      - 20003:20003
+      - 40001:40001
+      - 40002:40002
     tmpfs: /var/temp #上传临时文件夹
     tmpfs: /var/temp #上传临时文件夹
     working_dir: /var/www
     working_dir: /var/www
     volumes:
     volumes:

+ 2 - 2
docker-compose/nginx/vhost.conf

@@ -27,7 +27,7 @@ server {
         access_log /dev/null; 
         access_log /dev/null; 
     }
     }
     location /notice {
     location /notice {
-        proxy_pass http://192.168.10.90:20002;  
+        proxy_pass http://192.168.10.90:40001;  
         proxy_http_version 1.1;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_set_header Connection "upgrade";
@@ -35,7 +35,7 @@ server {
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
     }
     }
     location /msg {
     location /msg {
-        proxy_pass http://192.168.10.90:20003/;  
+        proxy_pass http://192.168.10.90:40002/;  
         proxy_http_version 1.1;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_set_header Connection "upgrade";

+ 1 - 0
docker-compose/php/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update && \
         make \
         make \
         autoconf \
         autoconf \
         libc-dev \
         libc-dev \
+	procps \
         # 其他扩展依赖(原有)
         # 其他扩展依赖(原有)
         libfreetype6-dev \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
         libjpeg62-turbo-dev \