replace with docker compose
This commit is contained in:
8
.github/workflows/README.md
vendored
8
.github/workflows/README.md
vendored
@@ -99,9 +99,9 @@ docker login crpi-u2903xccyzd6nqnc.cn-shanghai.personal.cr.aliyuncs.com \
|
||||
curl -fsSL https://get.docker.com -o get-docker.sh
|
||||
sudo sh get-docker.sh
|
||||
|
||||
# 安装 Docker Compose
|
||||
sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
|
||||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
# Docker Compose V2(命令为 docker compose,带空格)
|
||||
# 多数 Docker 安装已包含插件;若提示找不到 compose:
|
||||
# sudo apt-get update && sudo apt-get install -y docker-compose-plugin
|
||||
```
|
||||
|
||||
### 4. 首次部署准备
|
||||
@@ -164,7 +164,7 @@ mkdir -p /opt/life-echo/api
|
||||
### 4. 容器启动失败
|
||||
|
||||
- 检查 docker-compose.yml 文件是否正确
|
||||
- 查看容器日志:`docker-compose logs`
|
||||
- 查看容器日志:`docker compose logs`
|
||||
- 确认环境变量配置正确
|
||||
|
||||
## 手动触发
|
||||
|
||||
14
.github/workflows/docker-build-deploy.yml
vendored
14
.github/workflows/docker-build-deploy.yml
vendored
@@ -278,11 +278,11 @@ jobs:
|
||||
fi
|
||||
mv 'docker-compose.candidate.yml' '$COMPOSE_FILE'
|
||||
mv '.env.candidate' '.env'
|
||||
docker-compose -f '$COMPOSE_FILE' up -d --remove-orphans
|
||||
docker compose -f '$COMPOSE_FILE' up -d --remove-orphans
|
||||
echo '等待服务启动...'
|
||||
sleep 20
|
||||
docker image prune -f || true
|
||||
docker-compose -f '$COMPOSE_FILE' ps
|
||||
docker compose -f '$COMPOSE_FILE' ps
|
||||
"
|
||||
|
||||
- name: Verify deployment
|
||||
@@ -291,12 +291,12 @@ jobs:
|
||||
ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
|
||||
set -euo pipefail
|
||||
cd '$COMPOSE_DIR/api'
|
||||
docker-compose ps
|
||||
docker compose ps
|
||||
|
||||
API_CID=\$(docker-compose ps -q api)
|
||||
API_CID=\$(docker compose ps -q api)
|
||||
if [ -z \"\$API_CID\" ]; then
|
||||
echo '未找到 api 容器'
|
||||
docker-compose logs --tail=80 api || true
|
||||
docker compose logs --tail=80 api || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -312,9 +312,9 @@ jobs:
|
||||
|
||||
if [ \"\$API_HEALTH\" != 'healthy' ]; then
|
||||
echo 'api 容器未在预期时间内变为 healthy'
|
||||
docker-compose logs --tail=80 api || true
|
||||
docker compose logs --tail=80 api || true
|
||||
exit 1
|
||||
fi
|
||||
|
||||
docker-compose logs --tail=50 api
|
||||
docker compose logs --tail=50 api
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user