fix checkout branch

shell/container-code-update.sh

@@ -2,11 +2,11 @@
 
 # 更新代码
 cd /code && git pull || git reset --hard FETCH_HEAD
-cd /code && git checkout $PROGINN_BRANCH
+cd /code && git checkout -f origin/$PROGINN_BRANCH
 cd /boss && git pull || git reset --hard FETCH_HEAD
-cd /boss && git checkout $ROOTER_BRANCH
+cd /boss && git checkout -f origin/$ROOTER_BRANCH
 cd /proginn-frontend && git pull || git reset --hard FETCH_HEAD
-cd /proginn-frontend && git checkout $PROGINN_FRONTEND_BRANCH
+cd /proginn-frontend && git -f origin/checkout $PROGINN_FRONTEND_BRANCH
 cd /proginn-frontend && current_git_branch_latest_id=`git rev-parse HEAD`
 current_git_branch_last_id=`cat /var/www/.proginn-frontend-commit-id`
 if [[ "$current_git_branch_latest_id" != "$current_git_branch_last_id" ]]; then

shell/container-up.sh

@@ -25,13 +25,13 @@ cp /data/docker/config/crontab/container-code-up /etc/crontab
 # 更新代码
 chown -R www-data:www-data /code
 su -c "cd /code && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
-su -c "cd /code && git checkout $PROGINN_BRANCH" -s /bin/bash - www-data
+su -c "cd /code && git checkout -f origin/$PROGINN_BRANCH" -s /bin/bash - www-data
 chown -R www-data:www-data /boss
 su -c "cd /boss && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
-su -c "cd /boss && git checkout $ROOTER_BRANCH" -s /bin/bash - www-data
+su -c "cd /boss && git checkout -f origin/$ROOTER_BRANCH" -s /bin/bash - www-data
 chown -R www-data:www-data /proginn-frontend
 su -c "cd /proginn-frontend && git pull || git reset --hard FETCH_HEAD" -s /bin/bash - www-data
-su -c "cd /proginn-frontend && git checkout $PROGINN_FRONTEND_BRANCH" -s /bin/bash - www-data
+su -c "cd /proginn-frontend && git checkout -f origin/$PROGINN_FRONTEND_BRANCH" -s /bin/bash - www-data
 
 # 初始化目录
 chown -R www-data:www-data /var/www