diff --git a/Jenkinsfile b/Jenkinsfile index ee8014888..b3bba2d04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ pipeline { } } } - + stage('Docker Build & Push') { steps { script { @@ -158,9 +158,7 @@ pipeline { sh """ sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' cd ${cfg.deployBase}/${cfg.composeDir} - docker compose pull docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - docker image prune -f ' """ } diff --git a/projects/fangjia-script/crontab.txt b/projects/fangjia-script/crontab.txt index b64fdbb87..f2a07da86 100644 --- a/projects/fangjia-script/crontab.txt +++ b/projects/fangjia-script/crontab.txt @@ -33,7 +33,7 @@ # 均价监控告警 #0 9 * * 0 cd /home/goojia/webapps/fangjia-script && ./run.sh com/fangjia/script/xh/MonitorAvgPrice > /home/goojia/logs/MonitorAvgPrice.log 2>&1 # 插入住宅估价计算指令 -10 22 * * 6 cd /home/goojia/webapps/fangjia-script && ./run.sh com/fangjia/script/averager/InsertMonitorCalcCommandBatch > /home/goojia/logs/InsertMonitorCalcCommandBatch.log 2>&1 +10 23 * * 6 cd /home/goojia/webapps/fangjia-script && ./run.sh com/fangjia/script/averager/InsertMonitorCalcCommandBatch > /home/goojia/logs/InsertMonitorCalcCommandBatch.log 2>&1 # 插入商铺/写字楼租金估价计算指令 37 0 1 * * cd /home/goojia/webapps/fangjia-script && ./run.sh com/fangjia/script/averager/InsertMonitorSquareRentCalcCommandBatch > /home/goojia/logs/InsertMonitorSquareRentCalcCommandBatch.log 2>&1 # ES房价统计