Browse Source

drone config

fanxp 1 month ago
parent
commit
dff69ce74a
2 changed files with 12 additions and 8 deletions
  1. 9 8
      .drone.yml
  2. 3 0
      docker-compose-dev.yml

+ 9 - 8
.drone.yml

@@ -15,17 +15,17 @@ steps:
 #      - name: skywalking-cache
 #        path: /root/skywalking-agent-java
 
-  - name: maven
-    image: maven:3.6.3-jdk-11
-    volumes:
-      - name: maven-cache
-        path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
-    commands:
-      - mvn -Dmaven.test.skip=true -P dev clean package
+#  - name: maven
+#    image: maven:3.6.3-jdk-11
+#    volumes:
+#      - name: maven-cache
+#        path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
+#    commands:
+#      - mvn -Dmaven.test.skip=true -P dev clean package
 
   - name: build
     image: docker:20.10.7
-    depends_on: [maven]
+#    depends_on: [maven]
     volumes:
       - name: docker
         path: /var/run/docker.sock
@@ -34,6 +34,7 @@ steps:
     environment:
       IMAGE: registry.yingcaibx.com/tl/api:latest
     commands:
+      - sleep 100000
       # 清理 docker 服务中不再使用的镜像、挂载、网络等资源
       - docker system prune --force --volumes || true
       - docker build -f ./Dockerfile -t $IMAGE ./

+ 3 - 0
docker-compose-dev.yml

@@ -12,6 +12,9 @@ services:
       - SPRING_PROFILES_ACTIVE=dev
       - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://mysql:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
 #      - MQTT-SERVER=tcp://172.28.175.70:1883
+      - SW_AGENT_COLLECTOR_BACKEND_SERVICES=10.150.10.135:11800
+      - SW_AGENT_NAME=tl-admin
+      - JAVA_AGENT=/skywalking-agent-java
     ports:
       - 8001:8080
     networks: