mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-29 02:56:08 +08:00
测试基础镜像node版本
This commit is contained in:
parent
f87848c05b
commit
14b01ac761
|
@ -1,4 +1,4 @@
|
|||
FROM node:lts-alpine3.12
|
||||
FROM node:14.18.3-alpine3.12
|
||||
ARG QL_MAINTAINER="whyour"
|
||||
LABEL maintainer="${QL_MAINTAINER}"
|
||||
ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
|
||||
|
|
|
@ -69,6 +69,7 @@ import_config() {
|
|||
command_timeout_time=${CommandTimeoutTime:-"1h"}
|
||||
proxy_url=${ProxyUrl:-""}
|
||||
file_extensions=${RepoFileExtensions:-"js py"}
|
||||
current_branch=${QL_BRANCH}
|
||||
|
||||
if [[ -n "${DefaultCronRule}" ]]; then
|
||||
default_cron="${DefaultCronRule}"
|
||||
|
|
|
@ -253,8 +253,8 @@ update_qinglong() {
|
|||
|
||||
local no_restart="$1"
|
||||
[[ -f $dir_root/package.json ]] && ql_depend_old=$(cat $dir_root/package.json)
|
||||
reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" "master"
|
||||
git_pull_scripts $dir_root "master"
|
||||
reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${current_branch}
|
||||
git_pull_scripts $dir_root ${current_branch}
|
||||
|
||||
if [[ $exit_status -eq 0 ]]; then
|
||||
echo -e "\n更新$dir_root成功...\n"
|
||||
|
@ -270,8 +270,8 @@ update_qinglong() {
|
|||
|
||||
local url="https://github.com/whyour/qinglong-static.git"
|
||||
if [[ -d ${ql_static_repo}/.git ]]; then
|
||||
reset_romote_url ${ql_static_repo} ${url} "master"
|
||||
git_pull_scripts ${ql_static_repo} "master"
|
||||
reset_romote_url ${ql_static_repo} ${url} ${current_branch}
|
||||
git_pull_scripts ${ql_static_repo} ${current_branch}
|
||||
else
|
||||
git_clone_scripts ${url} ${ql_static_repo}
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue
Block a user