diff --git a/cmd b/cmd index 47bcb4f9..c45e2582 100755 --- a/cmd +++ b/cmd @@ -118,6 +118,10 @@ env_set() { else command="sed -i '/^$key=/c\\$key=$val' /www/.env" docker run -it --rm -v ${cur_path}:/www alpine sh -c "$command" + if [ $? -ne 0 ]; then + echo -e "${Error} ${RedBG} 设置env参数失败!${Font}" + exit 1 + fi fi } diff --git a/docker-compose.yml b/docker-compose.yml index 40bc3dbc..87748f3b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,6 @@ services: - ./docker/php/php.ini:/usr/local/etc/php/php.ini - ./docker/log/supervisor:/var/log/supervisor - ./:/var/www - - /etc/localtime:/etc/localtime:ro environment: TZ: "Asia/Shanghai" LANG: "C.UTF-8" @@ -39,7 +38,6 @@ services: volumes: - ./docker/nginx:/etc/nginx/conf.d - ./public:/var/www/public - - /etc/localtime:/etc/localtime:ro environment: TZ: "Asia/Shanghai" networks: @@ -70,7 +68,6 @@ services: volumes: - ./docker/mysql/conf.d:/etc/mysql/conf.d - ./docker/mysql/data:/var/lib/mysql - - /etc/localtime:/etc/localtime:ro environment: TZ: "Asia/Shanghai" MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}"