diff --git a/docker/Dockerfile b/docker/Dockerfile index 2a747098..293df509 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -39,4 +39,4 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && yarn build-back \ && yarn install --production --network-timeout 100000 \ && yarn cache clean -ENTRYPOINT ["entrypoint"] \ No newline at end of file +ENTRYPOINT ["./docker-entrypoint.sh"] \ No newline at end of file diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index eeed9f50..fdf88e58 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -2,7 +2,18 @@ set -e echo -e "======================1. 初始化命令========================\n" -. ${QL_DIR}/shell/share.sh +dir_shell=$(dirname $(readlink -f "$0")) +dir_root=$( + cd $dir_shell + cd .. + pwd +) + +. $dir_shell/share.sh + +detect_termux +detect_macos +define_cmd link_shell echo diff --git a/shell/share.sh b/shell/share.sh index ab0874e8..9661ce07 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -148,9 +148,4 @@ fix_config () { cp -fv $file_config_sample $file_config_user echo fi - perl -i -pe "{ - s|CMD_UPDATE|$cmd_update|g; - s|CMD_RMLOG|$cmd_rmlog|g; - s|CMD_TASK|$cmd_task|g - }" $list_crontab_user }