develop#配置变更

chenchangqin · chenchangqin · commit d95fb09413ef · 2020-08-10T18:09:26.000+08:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,22 +5,6 @@ networks:
     driver: bridge
 
 services:
-  nginx:
-    image: nginx:alpine
-    container_name: hyperf_nginx
-    ports:
-      - "${HTTP_PORT}:80"
-      - "${HTTPS_PORT}:443"
-    volumes:
-      - ./hyperf:/etc/nginx/www/hyperf:rw
-      - ${NGINX_DIR}/config/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ${NGINX_DIR}/config/conf.d:/etc/nginx/conf.d:ro
-      - ${NGINX_DIR}/log:/var/log/nginx:rw
-    restart: always
-    networks:
-      - hyperf
-    tty: true
-
   redis:
     container_name: hyperf_redis
     image: redis:latest
@@ -72,9 +56,24 @@ services:
       - "9200:9200"
     networks:
       - hyperf
-    #    command: /bin/bash -c "rm -rf /opt/www/hyperf/runtime/container && php /opt/www/hyperf/bin/hyperf.php start"
+    command: "php /opt/www/hyperf/bin/hyperf.php start"
     tty: true
 
+  nginx:
+    image: nginx:alpine
+    container_name: hyperf_nginx
+    ports:
+      - "${HTTP_PORT}:80"
+      - "${HTTPS_PORT}:443"
+    volumes:
+      - ./hyperf:/etc/nginx/www/hyperf:rw
+      - ${NGINX_DIR}/config/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ${NGINX_DIR}/config/conf.d:/etc/nginx/conf.d:ro
+      - ${NGINX_DIR}/log:/var/log/nginx:rw
+    restart: always
+    networks:
+      - hyperf
+    tty: true
 
   node:
     container_name: hyperf_node
@@ -89,5 +88,5 @@ services:
       - "9527:9527"
     networks:
       - hyperf
-    command: "npm start"
+    command: "npm run dev"
     tty: true
