File tree Expand file tree Collapse file tree 3 files changed +23
-6
lines changed
Expand file tree Collapse file tree 3 files changed +23
-6
lines changed Original file line number Diff line number Diff line change @@ -147,6 +147,13 @@ jobs:
147147 cd /home/${{ secrets.SSH_USERNAME }}/im-ai-deploy
148148 chmod +x deploy.sh
149149
150+ # 确保Docker Compose已安装
151+ if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
152+ echo "正在安装Docker Compose..."
153+ sudo curl -L "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
154+ sudo chmod +x /usr/local/bin/docker-compose
155+ fi
156+
150157 # 设置环境变量
151158 export DOCKER_REGISTRY=${{ env.DOCKER_REGISTRY }}
152159 export DOCKER_NAMESPACE=${{ env.DOCKER_NAMESPACE }}
Original file line number Diff line number Diff line change 33# 设置镜像标签,如果没有指定则使用latest
44export TAG=${1:- latest}
55
6+ # 检测docker compose命令类型
7+ if command -v docker-compose & > /dev/null; then
8+ DOCKER_COMPOSE_CMD=" docker-compose"
9+ elif docker compose version & > /dev/null; then
10+ DOCKER_COMPOSE_CMD=" docker compose"
11+ else
12+ echo " 错误: 未找到docker-compose或docker compose命令,请先安装Docker Compose"
13+ exit 1
14+ fi
15+
616# 登录Docker Registry
717echo " 登录Docker Registry..."
818docker login ${DOCKER_REGISTRY} --username=$REGISTRY_USERNAME --password=$REGISTRY_PASSWORD
919
1020# 拉取最新镜像
1121echo " 拉取最新镜像..."
12- docker-compose pull
22+ $DOCKER_COMPOSE_CMD pull
1323
1424# 启动服务
1525echo " 启动服务..."
16- docker-compose up -d
26+ $DOCKER_COMPOSE_CMD up -d
1727
1828echo " 部署完成!"
Original file line number Diff line number Diff line change @@ -27,9 +27,9 @@ services:
2727 container_name : im-core-server
2828 restart : always
2929 ports :
30- - " 9400:9400 "
30+ - " 9601:9601 "
3131 environment :
32- - SERVER_PORT=9400
32+ - SERVER_PORT=9601
3333 - JAVA_OPTS=-Xms128m -Xmx128m
3434 - SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
3535 - SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
@@ -45,9 +45,9 @@ services:
4545 container_name : ruoyi-auth
4646 restart : always
4747 ports :
48- - " 9200:9200 "
48+ - " 9210:9210 "
4949 environment :
50- - SERVER_PORT=9200
50+ - SERVER_PORT=9210
5151 - JAVA_OPTS=-Xms128m -Xmx128m
5252 - SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
5353 - SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
You can’t perform that action at this time.
0 commit comments