Ver código fonte

update build.sh

reghao 2 semanas atrás
pai
commit
a9f3168e1e
2 arquivos alterados com 36 adições e 7 exclusões
  1. 2 0
      build.sh
  2. 34 7
      docker-compose-tnb.yml

+ 2 - 0
build.sh

@@ -13,11 +13,13 @@ bin_dir="${base_dir}/tmp/bin"
 ###############################################################################
 create_dirs() {
     if [ -d ${proj_dir} ]; then
+        echo "删除已存在的 proj_dir: ${proj_dir}"
         rm -rf ${proj_dir}
     fi
     mkdir -p ${proj_dir}
 
     if [ -d ${bin_dir} ]; then
+        echo "删除已存在的 bin_dir: ${bin_dir}"
         rm -rf ${bin_dir}
     fi
     mkdir -p ${bin_dir}

+ 34 - 7
docker-compose-tnb.yml

@@ -5,7 +5,7 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
@@ -31,7 +31,7 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
@@ -57,9 +57,10 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
+      - NODE_ADDRESS=127.0.0.1
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
       - JAVA_TOOL_OPTIONS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0
     volumes:
@@ -83,7 +84,7 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
@@ -109,7 +110,7 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
@@ -135,7 +136,7 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
@@ -161,7 +162,33 @@ services:
     restart: always
     network_mode: host
     environment:
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
+      - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
+      - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
+      # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)
+      - JAVA_TOOL_OPTIONS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'       # 最多使用 2 核 CPU
+          memory: 2048M     # 最多使用 2G 内存
+        reservations:
+          cpus: '0.5'       # 宿主机最少为该容器保留 0.5 核
+          memory: 1024M     # 宿主机最少为该容器保留 1G 内存
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "1"
+  tnbadmin:
+    image: registry.cn-chengdu.aliyuncs.com/tnb028/tnbadmin
+    container_name: tnbadmin
+    restart: always
+    network_mode: host
+    environment:
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR=127.0.0.1
       - SPRING_CLOUD_NACOS_CONFIG_USERNAME=nacos
       - SPRING_CLOUD_NACOS_CONFIG_PASSWORD=Test_123456
       # 告诉 JVM 自动根据容器限制来计算堆内存(重要!)