diff --git a/.github/workflows/docker-build-deploy.yml b/.github/workflows/docker-build-deploy.yml index 792550c..54623d5 100644 --- a/.github/workflows/docker-build-deploy.yml +++ b/.github/workflows/docker-build-deploy.yml @@ -118,60 +118,38 @@ jobs: scp -P $SSH_PORT ./api/$COMPOSE_FILE $SSH_USER@$SSH_HOST:$COMPOSE_DIR/api/ # 在远程服务器上执行部署操作 - ssh -p $SSH_PORT $SSH_USER@$SSH_HOST bash -s << EOF + ssh -p $SSH_PORT $SSH_USER@$SSH_HOST " set -e - export COMPOSE_DIR="$COMPOSE_DIR" - export COMPOSE_FILE="$COMPOSE_FILE" - export IMAGE_TAG="$IMAGE_TAG" + cd $COMPOSE_DIR/api - cd \$COMPOSE_DIR/api + echo '拉取最新镜像: $IMAGE_TAG' + docker pull '$IMAGE_TAG' || true - echo "拉取最新镜像: \$IMAGE_TAG" - docker pull "\$IMAGE_TAG" || true + echo '停止现有容器...' + docker-compose -f '$COMPOSE_FILE' down || true - echo "停止现有容器..." - docker-compose -f "\$COMPOSE_FILE" down || true - - echo "更新 docker-compose.yml 中的镜像标签..." - # 使用 sed 更新镜像标签(简单可靠) - # 备份原文件 - cp "\$COMPOSE_FILE" "\${COMPOSE_FILE}.bak" + echo '更新 docker-compose.yml 中的镜像标签...' + cp '$COMPOSE_FILE' '${COMPOSE_FILE}.bak' # 更新所有包含 lifecho-api 或 life-echo-api 的 image 行 - sed -i.tmp "s|image:.*lifecho-api.*|image: \$IMAGE_TAG|g" "\$COMPOSE_FILE" - sed -i.tmp "s|image:.*life-echo-api.*|image: \$IMAGE_TAG|g" "\$COMPOSE_FILE" + sed -i.tmp 's|image:.*lifecho-api.*|image: $IMAGE_TAG|g' '$COMPOSE_FILE' + sed -i.tmp 's|image:.*life-echo-api.*|image: $IMAGE_TAG|g' '$COMPOSE_FILE' - # 如果服务使用 build 而不是 image,添加 image 行 - # 在 api 服务中,如果只有 build 没有 image,添加 image - if ! grep -q "image:" "\$COMPOSE_FILE" || grep -q "build:" "\$COMPOSE_FILE"; then - # 在 api 服务的 build 行后添加 image - sed -i.tmp '/^ api:/,/^ container_name:/ { - /build:/a\ - image: '\$IMAGE_TAG' - }' "\$COMPOSE_FILE" - - # 在 celery-worker 服务的 build 行后添加 image - sed -i.tmp '/^ celery-worker:/,/^ container_name:/ { - /build:/a\ - image: '\$IMAGE_TAG' - }' "\$COMPOSE_FILE" - fi + echo '启动新容器...' + docker-compose -f '$COMPOSE_FILE' pull || true + docker-compose -f '$COMPOSE_FILE' up -d - echo "启动新容器..." - docker-compose -f "\$COMPOSE_FILE" pull || true - docker-compose -f "\$COMPOSE_FILE" up -d - - echo "等待容器启动..." + echo '等待容器启动...' sleep 10 - echo "清理旧镜像..." + echo '清理旧镜像...' docker image prune -f || true - echo "部署完成!" + echo '部署完成!' - echo "检查容器状态..." - docker-compose -f "\$COMPOSE_FILE" ps - EOF + echo '检查容器状态...' + docker-compose -f '$COMPOSE_FILE' ps + " - name: Verify deployment env: