fanxp 1 month ago
parent
commit
ddedf5cdc0
3 changed files with 19 additions and 15 deletions
  1. 15 14
      .drone.yml
  2. 1 1
      docker-compose-dev.yml
  3. 3 0
      docker-compose-pre.yml

+ 15 - 14
.drone.yml

@@ -6,15 +6,6 @@ node:
   mode: local_test
 
 steps:
-  # 只需要下载一次,以后将其注释
-#  - name: skywalking
-#    image: alpine/git:v2.45.2
-#    commands:
-#      - git clone https://git.yingcaibx.com/public/skywalking-agent-java.git /root/skywalking-agent-java
-#    volumes:
-#      - name: skywalking-cache
-#        path: /root/skywalking-agent-java
-
   - name: maven
     image: maven:3.6.3-jdk-11
     volumes:
@@ -23,17 +14,27 @@ steps:
     commands:
       - mvn -Dmaven.test.skip=true -P dev clean package
 
+  # 只需要下载一次,以后将其注释
+  - name: skywalking
+    image: alpine/git:v2.45.2
+    commands:
+      - git clone https://git.yingcaibx.com/public/skywalking-agent-java.git /drone/src/skywalking-agent-java
+#    volumes:
+#      - name: skywalking-cache
+#        path: /root/skywalking-agent-java
+
   - name: build
     image: docker:20.10.7
     depends_on: [maven]
     volumes:
       - name: docker
         path: /var/run/docker.sock
-      - name: skywalking-cache
-        path: /drone/src/skywalking-agent-java
+#      - name: skywalking-cache
+#        path: /drone/src/skywalking-agent-java
     environment:
       IMAGE: registry.yingcaibx.com/tl/api:latest
     commands:
+      - sleep 10000
       # 清理 docker 服务中不再使用的镜像、挂载、网络等资源
       - docker system prune --force --volumes || true
       - docker build -f ./Dockerfile -t $IMAGE ./
@@ -60,9 +61,9 @@ volumes:
   - name: maven-cache
     host:
       path: /data/cache/tl/api
-  - name: skywalking-cache
-    host:
-      path: /data/cache/skywalking
+#  - name: skywalking-cache
+#    host:
+#      path: /data/cache/skywalking
 
 ---
 kind: pipeline

+ 1 - 1
docker-compose-dev.yml

@@ -12,7 +12,7 @@ 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
       - SW_AGENT_COLLECTOR_BACKEND_SERVICES=10.150.10.135:11800
-      - SW_AGENT_NAME=tl-admin
+      - SW_AGENT_NAME=tl-admin-dev
       - JAVA_AGENT=/skywalking-agent-java/skywalking-agent.jar
     ports:
       - 8001:8080

+ 3 - 0
docker-compose-pre.yml

@@ -11,6 +11,9 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=pre
       - 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
+      - SW_AGENT_COLLECTOR_BACKEND_SERVICES=10.150.10.135:11800
+      - SW_AGENT_NAME=tl-admin-pre
+      - JAVA_AGENT=/skywalking-agent-java/skywalking-agent.jar
     ports:
       - 8080:8080
     networks: