♻️ 迁移 docker compose 并修复 runner 升级版本识别

docker-runner/common/check_crlf.sh

@@ -90,9 +90,9 @@ if [ $FIXED_COUNT -gt 0 ]; then
     echo -e "${GREEN}✓ 所有问题已自动修复!${NC}"
     echo ""
     echo "建议执行以下命令重启容器:"
-    echo "  docker-compose down"
-    echo "  docker-compose build --no-cache"
-    echo "  docker-compose up -d"
+    echo "  docker compose down"
+    echo "  docker compose build --no-cache"
+    echo "  docker compose up -d"
     echo ""
 
     # 询问是否立即重启
@@ -100,13 +100,13 @@ if [ $FIXED_COUNT -gt 0 ]; then
     echo ""
     if [[ $REPLY =~ ^[Yy]$ ]]; then
         echo "正在重启容器..."
-        docker-compose down
-        docker-compose build --no-cache
-        docker-compose up -d
+        docker compose down
+        docker compose build --no-cache
+        docker compose up -d
         sleep 3
         echo ""
         echo "容器状态:"
-        docker-compose ps
+        docker compose ps
         echo ""
         echo "查看日志:"
         docker logs gitea-runner --tail=30

docker-runner/common/entrypoint.sh

@@ -185,7 +185,7 @@ else
     echo "⚠ act_runner not installed yet!"
     echo ""
     echo "Please run the setup script first:"
-    echo "  docker-compose exec gitea-runner /data/setup.sh"
+    echo "  docker compose exec gitea-runner /data/setup.sh"
     echo ""
     echo "Container is waiting..."
 
@@ -243,7 +243,7 @@ if [ $RUNNER_COUNT -eq 0 ]; then
     echo "⚠ No runners registered yet!"
     echo ""
     echo "Please run the register script to add a runner:"
-    echo "  docker-compose exec gitea-runner /data/register.sh"
+    echo "  docker compose exec gitea-runner /data/register.sh"
     echo ""
 fi
 

docker-runner/common/register.sh

@@ -11,7 +11,7 @@ if ! command -v act_runner &> /dev/null; then
     echo "✗ act_runner is not installed!"
     echo ""
     echo "Please run the setup script first:"
-    echo "  docker-compose exec gitea-runner /data/setup.sh"
+    echo "  docker compose exec gitea-runner /data/setup.sh"
     exit 1
 fi
 
@@ -301,10 +301,10 @@ echo "  .runner:      $(ls -lh .runner 2>/dev/null | awk '{print $5}' || echo 'N
 echo "  config.yaml:  $(ls -lh config.yaml 2>/dev/null | awk '{print $5}' || echo 'N/A')"
 echo ""
 echo "Useful commands:"
-echo "  View logs:     docker-compose exec gitea-runner /data/manage.sh logs ${RUNNER_NAME}"
-echo "  Follow logs:   docker-compose exec gitea-runner /data/manage.sh follow ${RUNNER_NAME}"
-echo "  Check status:  docker-compose exec gitea-runner /data/manage.sh status"
-echo "  Restart:       docker-compose exec gitea-runner /data/manage.sh restart ${RUNNER_NAME}"
+echo "  View logs:     docker compose exec gitea-runner /data/manage.sh logs ${RUNNER_NAME}"
+echo "  Follow logs:   docker compose exec gitea-runner /data/manage.sh follow ${RUNNER_NAME}"
+echo "  Check status:  docker compose exec gitea-runner /data/manage.sh status"
+echo "  Restart:       docker compose exec gitea-runner /data/manage.sh restart ${RUNNER_NAME}"
 echo ""
 
 # 显示最近的日志
@@ -327,6 +327,6 @@ if [ -f "/var/log/supervisor/runner-${RUNNER_NAME}.err.log" ]; then
         echo "$ERR_CONTENT"
         echo ""
         echo "Check full error log with:"
-        echo "  docker-compose exec gitea-runner cat /var/log/supervisor/runner-${RUNNER_NAME}.err.log"
+        echo "  docker compose exec gitea-runner cat /var/log/supervisor/runner-${RUNNER_NAME}.err.log"
     fi
 fi

docker-runner/common/setup.sh

@@ -134,7 +134,7 @@ if curl -L "$DOWNLOAD_URL" -o "$INSTALL_PATH"; then
         echo ""
         echo "Next steps:"
         echo "1. Register the runner:"
-        echo "   docker-compose exec gitea-runner /data/register.sh"
+        echo "   docker compose exec gitea-runner /data/register.sh"
         echo ""
         echo "2. Start using the runner after registration."
         echo ""

docker-runner/common/upgrade.sh

@@ -29,7 +29,7 @@ fail() {
 }
 
 extract_version_number() {
-    sed -nE 's/.*version[[:space:]]+([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' | head -n 1
+    sed -nE 's/.*version[[:space:]]+v?([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' | head -n 1
 }
 
 extract_versions_from_listing() {