fanxp 2 years ago
parent
commit
612f873361
2 changed files with 1 additions and 19 deletions
  1. 0 18
      .drone.yml
  2. 1 1
      docker-compose.yml

+ 0 - 18
.drone.yml

@@ -11,10 +11,6 @@ steps:
     volumes:
       - name: maven-cache
         path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
-    environment:
-      DRONE_CPU_PERIOD: 50000
-      DRONE_CPU_QUOTA: 150000
-      DRONE_MEMORY_LIMIT: 4096*1024*1024*8
     commands:
       - mvn -Dmaven.test.skip=true -P dev clean package
 
@@ -26,9 +22,6 @@ steps:
         path: /var/run/docker.sock
     environment:
       IMAGE: registry.yingcaibx.com/tl/api:latest
-      DRONE_CPU_PERIOD: 50000
-      DRONE_CPU_QUOTA: 150000
-      DRONE_MEMORY_LIMIT: 4096*1024*1024*8
     commands:
       # 清理 docker 服务中不再使用的镜像、挂载、网络等资源
       - docker system prune --force --volumes || true
@@ -40,10 +33,6 @@ steps:
     volumes:
       - name: docker
         path: /var/run/docker.sock
-    environment:
-      DRONE_CPU_PERIOD: 50000
-      DRONE_CPU_QUOTA: 150000
-      DRONE_MEMORY_LIMIT: 4096*1024*1024*8
     commands:
       - docker-compose -f docker-compose.yml up -d
 
@@ -75,10 +64,6 @@ steps:
     volumes:
       - name: maven-cache
         path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
-    environment:
-      DRONE_CPU_PERIOD: 50000
-      DRONE_CPU_QUOTA: 150000
-      DRONE_MEMORY_LIMIT: 4096*1024*1024*8
     commands:
       - mvn -Dmaven.test.skip=true -P dev clean package
 
@@ -89,9 +74,6 @@ steps:
         path: /var/run/docker.sock
     environment:
       IMAGE: registry.yingcaibx.com/tl/api
-      DRONE_CPU_PERIOD: 50000
-      DRONE_CPU_QUOTA: 150000
-      DRONE_MEMORY_LIMIT: 4096*1024*1024*8
     depends_on: [clone]
     commands:
       - docker login -u yxt -p qwe123QWE registry.yingcaibx.com

+ 1 - 1
docker-compose.yml

@@ -9,7 +9,7 @@ services:
     restart: always
     container_name: tl_api
     environment:
-#      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
       - MQTT_CLIENT-ID=tl
     networks:
       - docker_networks_default