diff --git a/docker-compose.yml b/docker-compose.yml index 6d0f76c..c433931 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,5 +11,3 @@ services: - ./php.ini:/usr/local/etc/php/php.ini working_dir: /app/service stdin_open: true - command: ["php", "start.php", "start"] - diff --git a/init b/init index 4810eb3..03c0409 100755 --- a/init +++ b/init @@ -25,8 +25,7 @@ if [ "$(docker ps -a -q -f name=$WORKERMAN_CONTAINER_NAME)" ]; then fi # 启动容器 -docker compose up -d +docker compose -f docker-compose.yml up -d # 进入容器并执行composer install -docker exec -it $WORKERMAN_CONTAINER_NAME bash -c "composer install" -docker restart $WORKERMAN_CONTAINER_NAME \ No newline at end of file +docker exec -it $WORKERMAN_CONTAINER_NAME bash -c "composer install" \ No newline at end of file diff --git a/server b/server index 7fc7133..c43467f 100755 --- a/server +++ b/server @@ -31,9 +31,9 @@ else if [ "$1" = "logs" ]; then docker logs -f $WORKERMAN_CONTAINER_NAME elif [ "$1" = "start" ]; then - : + docker exec -itd $WORKERMAN_CONTAINER_NAME bash -c "php start.php start" elif [ "$1" = "restart" ]; then - docker restart $WORKERMAN_CONTAINER_NAME + docker exec -itd $WORKERMAN_CONTAINER_NAME bash -c "php start.php restart" elif [ "$1" = "status" ]; then docker exec -it $WORKERMAN_CONTAINER_NAME bash -c "php start.php status" elif [ "$1" = "reload" ]; then