github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-22 00:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 添加 TTY 参数检测，优化 Docker 命令执行

Browse Source
This commit is contained in:
kuaifan 2026-01-03 23:09:59 +00:00
parent ea0d27fdea
commit bd7841ac05
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd
View File

@ -19,6 +19,12 @@ WORK_DIR="$(pwd)"
INPUT_ARGS=$@ INPUT_ARGS=$@
COMPOSE="docker-compose" COMPOSE="docker-compose"
# TTY 参数检测
TTY_FLAG=""
if [ -t 0 ] && [ -t 1 ]; then
TTY_FLAG="-it"
fi
# 缓存执行 # 缓存执行
if [ -z "$CACHED_EXECUTION" ] && [ "$1" == "update" ]; then if [ -z "$CACHED_EXECUTION" ] && [ "$1" == "update" ]; then
if ! cat "$0" > ._cmd 2>/dev/null; then if ! cat "$0" > ._cmd 2>/dev/null; then
@ -88,7 +94,7 @@ rand_string() {
if [[ `uname` == 'Linux' ]]; then if [[ `uname` == 'Linux' ]]; then
echo "$(date +%s%N | md5sum | cut -c 1-${lan})" echo "$(date +%s%N | md5sum | cut -c 1-${lan})"
else else
echo "$(docker run -it --rm nginx:alpine sh -c "date +%s%N | md5sum | cut -c 1-${lan}")" echo "$(docker run $TTY_FLAG --rm nginx:alpine sh -c "date +%s%N | md5sum | cut -c 1-${lan}")"
fi fi
} }
@ -241,7 +247,7 @@ container_exec() {
error "没有找到 ${container} 容器!" error "没有找到 ${container} 容器!"
exit 1 exit 1
fi fi
docker exec -it "$name" /bin/sh -c "$cmd" docker exec $TTY_FLAG "$name" /bin/sh -c "$cmd"
} }
# 备份数据库、还原数据库 # 备份数据库、还原数据库
@ -341,11 +347,11 @@ https_auto() {
if [[ "$restart_nginx" == "y" ]]; then if [[ "$restart_nginx" == "y" ]]; then
$COMPOSE up -d $COMPOSE up -d
fi fi
docker run -it --rm -v $(pwd):/work nginx:alpine sh /work/bin/https install docker run $TTY_FLAG --rm -v $(pwd):/work nginx:alpine sh /work/bin/https install
if [[ 0 -eq $? ]]; then if [[ 0 -eq $? ]]; then
container_exec nginx "nginx -s reload" container_exec nginx "nginx -s reload"
fi fi
new_job="* 6 * * * docker run -it --rm -v $(pwd):/work nginx:alpine sh /work/bin/https renew" new_job="* 6 * * * docker run --rm -v $(pwd):/work nginx:alpine sh /work/bin/https renew"
current_crontab=$(crontab -l 2>/dev/null) current_crontab=$(crontab -l 2>/dev/null)
if ! echo "$current_crontab" | grep -v "https renew"; then if ! echo "$current_crontab" | grep -v "https renew"; then
echo "任务已存在，无需添加。" echo "任务已存在，无需添加。"
@ -376,7 +382,7 @@ env_set() {
if [[ `uname` == 'Linux' ]]; then if [[ `uname` == 'Linux' ]]; then
sed -i "/^${key}=/c\\${key}=${val}" ${WORK_DIR}/.env sed -i "/^${key}=/c\\${key}=${val}" ${WORK_DIR}/.env
else else
docker run -it --rm -v ${WORK_DIR}:/www nginx:alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env" docker run $TTY_FLAG --rm -v ${WORK_DIR}:/www nginx:alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env"
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
error "设置env参数失败！" error "设置env参数失败！"
@ -402,7 +408,7 @@ env_init() {
if [ -z "$(env_get UPDATE_TIME)" ]; then if [ -z "$(env_get UPDATE_TIME)" ]; then
env_set DB_HOST "mariadb" env_set DB_HOST "mariadb"
env_set REDIS_HOST "redis" env_set REDIS_HOST "redis"
docker run -it --rm -v ${WORK_DIR}:/www nginx:alpine sh -c "sed -i 's|/etc/nginx/conf.d/site/|/var/www/docker/nginx/site/|g' /www/docker/nginx/site/*.conf &> /dev/null" docker run $TTY_FLAG --rm -v ${WORK_DIR}:/www nginx:alpine sh -c "sed -i 's|/etc/nginx/conf.d/site/|/var/www/docker/nginx/site/|g' /www/docker/nginx/site/*.conf &> /dev/null"
fi fi
} }
@ -791,7 +797,7 @@ case "$1" in
elif [[ "$cli" == "dev" ]]; then elif [[ "$cli" == "dev" ]]; then
por="-p 8880:8880" por="-p 8880:8880"
fi fi
docker run -it --rm -v ${WORK_DIR}/resources/mobile:/work -w /work ${por} kuaifan/eeui-cli:0.0.1 eeui ${cli} docker run $TTY_FLAG --rm -v ${WORK_DIR}/resources/mobile:/work -w /work ${por} kuaifan/eeui-cli:0.0.1 eeui ${cli}
;; ;;
"npm") "npm")
shift 1 shift 1
@ -799,12 +805,12 @@ case "$1" in
pushd electron || exit pushd electron || exit
npm "$@" npm "$@"
popd || exit popd || exit
docker run --rm -it -v ${WORK_DIR}/resources/mobile:/work -w /work --entrypoint=/bin/bash node:16 -c "npm $@" docker run $TTY_FLAG --rm -v ${WORK_DIR}/resources/mobile:/work -w /work --entrypoint=/bin/bash node:16 -c "npm $@"
;; ;;
"doc") "doc")
shift 1 shift 1
container_exec php "php app/Http/Controllers/Api/apidoc.php" container_exec php "php app/Http/Controllers/Api/apidoc.php"
docker run -it --rm -v ${WORK_DIR}:/home/node/apidoc kuaifan/apidoc -i app/Http/Controllers/Api -o public/docs docker run $TTY_FLAG --rm -v ${WORK_DIR}:/home/node/apidoc kuaifan/apidoc -i app/Http/Controllers/Api -o public/docs
container_exec php "php app/Http/Controllers/Api/apidoc.php restore" container_exec php "php app/Http/Controllers/Api/apidoc.php restore"
;; ;;
"debug") "debug")