Skip to content

Commit 542c9d2

Browse files
imchatkitimchatkit
committed
ci: 更新 Docker 构建和部署配置
- 注释掉 ruoyi-auth、ruoyi-system 和 ruoyi-resource 的构建和推送步骤 - 修改 im-gateway 和 im-core-server 的网络配置，使用桥接网络 - 替换 extra_hosts 为端口映射，以适应新网络配置- 移除 ruoyi-auth、ruoyi-system 和 ruoyi-resource 的服务定义 - 添加 im-network 网络定义
1 parent 7c57409 commit 542c9d2

File tree

2 files changed

+77
-82
lines changed

2 files changed

+77
-82
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ jobs:
7878
push: true
7979
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/im-gateway:${{ github.sha }}
8080

81-
- name: Build and push ruoyi-auth
82-
uses: docker/build-push-action@v5
83-
with:
84-
context: ./framework/ruoyi-auth
85-
push: true
86-
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-auth:${{ github.sha }}
81+
# - name: Build and push ruoyi-auth
82+
# uses: docker/build-push-action@v5
83+
# with:
84+
# context: ./framework/ruoyi-auth
85+
# push: true
86+
# tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-auth:${{ github.sha }}
8787

88-
- name: Build and push ruoyi-system
89-
uses: docker/build-push-action@v5
90-
with:
91-
context: ./framework/ruoyi-modules/ruoyi-system
92-
push: true
93-
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-system:${{ github.sha }}
88+
# - name: Build and push ruoyi-system
89+
# uses: docker/build-push-action@v5
90+
# with:
91+
# context: ./framework/ruoyi-modules/ruoyi-system
92+
# push: true
93+
# tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-system:${{ github.sha }}
9494

9595
# - name: Build and push ruoyi-gen
9696
# uses: docker/build-push-action@v5
@@ -106,12 +106,12 @@ jobs:
106106
# push: true
107107
# tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-job:${{ github.sha }}
108108

109-
- name: Build and push ruoyi-resource
110-
uses: docker/build-push-action@v5
111-
with:
112-
context: ./framework/ruoyi-modules/ruoyi-resource
113-
push: true
114-
tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-resource:${{ github.sha }}
109+
# - name: Build and push ruoyi-resource
110+
# uses: docker/build-push-action@v5
111+
# with:
112+
# context: ./framework/ruoyi-modules/ruoyi-resource
113+
# push: true
114+
# tags: ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_NAMESPACE }}/ruoyi-resource:${{ github.sha }}
115115

116116
- name: Build and push im-core-server
117117
uses: docker/build-push-action@v5

‎docker-compose.yml‎

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ services:
55
image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/im-gateway:${TAG:-latest}
66
container_name: im-gateway
77
restart: always
8-
network_mode: host
8+
networks:
9+
- im-network
10+
ports:
11+
- "8080:8080"
12+
- "9688:9688"
913
deploy:
1014
resources:
1115
limits:
@@ -19,16 +23,15 @@ services:
1923
- SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
2024
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
2125
- SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
22-
extra_hosts:
23-
- "nacos.myimkit.com:192.168.1.101"
24-
- "mysql.myimkit.com:192.168.1.101"
25-
- "redis.myimkit.com:192.168.1.101"
2626

2727
im-core-server:
2828
image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/im-core-server:${TAG:-latest}
2929
container_name: im-core-server
3030
restart: always
31-
network_mode: host
31+
networks:
32+
- im-network
33+
ports:
34+
- "9601:9601"
3235
deploy:
3336
resources:
3437
limits:
@@ -41,53 +44,52 @@ services:
4144
- SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
4245
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
4346
- SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
44-
extra_hosts:
45-
- "nacos.myimkit.com:192.168.1.101"
46-
- "mysql.myimkit.com:192.168.1.101"
47-
- "redis.myimkit.com:192.168.1.101"
48-
ruoyi-auth:
49-
image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-auth:${TAG:-latest}
50-
container_name: ruoyi-auth
51-
restart: always
52-
network_mode: host
53-
deploy:
54-
resources:
55-
limits:
56-
memory: 200M
57-
environment:
58-
- SERVER_PORT=9210
59-
- JAVA_OPTS=-Xms138m -Xmx138m
60-
- SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
61-
- SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
62-
- SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
63-
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
64-
- SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
65-
extra_hosts:
66-
- "nacos.myimkit.com:192.168.1.101"
67-
- "mysql.myimkit.com:192.168.1.101"
68-
- "redis.myimkit.com:192.168.1.101"
6947

70-
ruoyi-system:
71-
image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-system:${TAG:-latest}
72-
container_name: ruoyi-system
73-
restart: always
74-
network_mode: host
75-
deploy:
76-
resources:
77-
limits:
78-
memory: 200M
79-
environment:
80-
- SERVER_PORT=9201
81-
- JAVA_OPTS=-Xms138m -Xmx138m
82-
- SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
83-
- SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
84-
- SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
85-
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
86-
- SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
87-
extra_hosts:
88-
- "nacos.myimkit.com:192.168.1.101"
89-
- "mysql.myimkit.com:192.168.1.101"
90-
- "redis.myimkit.com:192.168.1.101"
48+
49+
# ruoyi-auth:
50+
# image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-auth:${TAG:-latest}
51+
# container_name: ruoyi-auth
52+
# restart: always
53+
# networks:
54+
# - im-network
55+
# ports:
56+
# - "9210:9210"
57+
# deploy:
58+
# resources:
59+
# limits:
60+
# memory: 200M
61+
# environment:
62+
# - SERVER_PORT=9210
63+
# - JAVA_OPTS=-Xms138m -Xmx138m
64+
# - SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
65+
# - SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
66+
# - SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
67+
# - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
68+
# - SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
69+
70+
71+
72+
# ruoyi-system:
73+
# image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-system:${TAG:-latest}
74+
# container_name: ruoyi-system
75+
# restart: always
76+
# networks:
77+
# - im-network
78+
# ports:
79+
# - "9201:9201"
80+
# deploy:
81+
# resources:
82+
# limits:
83+
# memory: 200M
84+
# environment:
85+
# - SERVER_PORT=9201
86+
# - JAVA_OPTS=-Xms138m -Xmx138m
87+
# - SPRING_CLOUD_NACOS_SERVER_ADDR=${NACOS_SERVER:-10.1.12.11:8848}
88+
# - SPRING_CLOUD_NACOS_USERNAME=${NACOS_USERNAME:-nacos}
89+
# - SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
90+
# - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
91+
# - SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
92+
9193

9294
# ruoyi-gen:
9395
# image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-gen:${TAG:-latest}
@@ -107,10 +109,6 @@ services:
107109
# - SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
108110
# - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
109111
# - SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
110-
# extra_hosts:
111-
# - "nacos.myimkit.com:192.168.1.101"
112-
# - "mysql.myimkit.com:192.168.1.101"
113-
# - "redis.myimkit.com:192.168.1.101"
114112

115113
# ruoyi-job:
116114
# image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-job:${TAG:-latest}
@@ -130,10 +128,7 @@ services:
130128
# - SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
131129
# - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
132130
# - SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
133-
# extra_hosts:
134-
# - "nacos.myimkit.com:192.168.1.101"
135-
# - "mysql.myimkit.com:192.168.1.101"
136-
# - "redis.myimkit.com:192.168.1.101"
131+
137132

138133
# ruoyi-resource:
139134
# image: ${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/ruoyi-resource:${TAG:-latest}
@@ -153,8 +148,8 @@ services:
153148
# - SPRING_CLOUD_NACOS_PASSWORD=${NACOS_PASSWORD:-abcdimkit8989a}
154149
# - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=${NACOS_DISCOVERY_GROUP:-DEFAULT_GROUP}
155150
# - SPRING_CLOUD_NACOS_CONFIG_GROUP=${NACOS_CONFIG_GROUP:-DEFAULT_GROUP}
156-
# extra_hosts:
157-
# - "nacos.myimkit.com:192.168.1.101"
158-
# - "mysql.myimkit.com:192.168.1.101"
159-
# - "redis.myimkit.com:192.168.1.101"
160151

152+
153+
networks:
154+
im-network:
155+
driver: bridge

0 commit comments

Comments
 (0)