Browse Source

动态宿主ip

animeic-cd 1 year ago
parent
commit
00f9b5d47f
4 changed files with 55 additions and 21 deletions
  1. 34 0
      config-service copy.yaml
  2. 14 18
      docker-compose.yaml
  3. 6 3
      start.sh
  4. 1 0
      url

+ 34 - 0
config-service copy.yaml

@@ -0,0 +1,34 @@
+log:
+  fileName: cr.log
+  level: 1
+  serviceName: cr-bus
+  
+configer:
+  -
+    name: cr-mongo
+    value: mongodb://root:crzzz_x@cr-mongo:27017/cr?authSource=admin
+    devValue: mongodb://root:crzzz_x@127.0.0.1:17017/cr?authSource=admin
+  
+  -
+    name: cr-user-mongo
+    value: mongodb://root:crzzz_x@cr-mongo:27017/user?authSource=admin
+    devValue: mongodb://root:crzzz_x@127.0.0.1:17017/user?authSource=admin
+
+  -
+    name: cr-redis
+    value: cr-redis:6379#0#default#crzzz_x
+    devValue: 127.0.0.1:16379#0#default#crzzz_x
+
+# adapter:
+#   -
+#     busName: comm
+#     nats: nats://comm-bus:4222
+
+startLocalNats: true
+startNatsShellParams: "-p 4222 -m 8222 -js"
+startNatsPort: 4222
+
+nats:
+  url: nats://cr-bus:4222
+  maxReconnect: 10000
+  reconnDelaySecond: 5

+ 14 - 18
docker-compose.yaml

@@ -57,17 +57,6 @@ services:
     ports: 
       - 17017:27017
 
-  cr-svc:
-    image: registry.cn-chengdu.aliyuncs.com/infish/pack-cr:v1.0.0
-    restart: always
-    depends_on:
-      - cr-bus
-    environment: 
-      NATS: nats://cr-bus:4222
-      UPLOAD_PKG_URL: http://192.168.110.238:8085/cr/pkg
-    volumes:
-      - ~/cr-svc/data/package:/root/projects/package
-
   cr-user:
     image: registry.cn-chengdu.aliyuncs.com/infish/pack-comm-usercenter:v1.0.1
     restart: always
@@ -84,10 +73,17 @@ services:
     volumes:
       - ./mongo-migrations:/data/migrations
 
-
-
-
-    
-
-
-
+  cr-svc:
+    image: registry.cn-chengdu.aliyuncs.com/infish/pack-cr:v1.0.0
+    restart: always
+    depends_on:
+      - cr-bus
+    volumes:
+    # api上传:配置文件上传地址package对应/cr/pkg
+    # dockerfile中添加package目录到容器/root/projects/package
+    # 上传文件挂载到宿主机本地目录
+      - ~/cr-svc/data/package:/root/projects/package
+      # 部署时,调用start.sh,获取宿主机ip注入api容器中
+      - ./url:/root/projects/url
+    environment: 
+      NATS: nats://cr-bus:4222

+ 6 - 3
start.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
-
-docker-compose up -d --remove-orphans
-docker-compose ps
+# 获取宿主机ip地址,防止ip动态变化导致访问不到文件
+# echo -e
+# echo '      MASTER_IP: '$(hostname -I | awk '{print $1}') >> docker-compose.yaml
+echo $(hostname -I | awk '{print $1}') > url
+docker compose up -d --remove-orphans
+docker compose ps

+ 1 - 0
url

@@ -0,0 +1 @@
+198.19.32.91