diff --git a/.drone.yml b/.drone.yml index b355716..ca8ec03 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,8 @@ steps: path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载 - name: maven-build path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 + - name: skywalking-agent + path: /app/build/skywalking-agent commands: # 定义在Docker容器中执行的shell命令 - sed -i 's/$DRONE_COMMIT_BRANCH/'"$DRONE_COMMIT_BRANCH"'/' start.sh - bash maven.sh @@ -25,8 +27,6 @@ steps: path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 - name: docker path: /var/run/docker.sock # 挂载宿主机的docker - - name: skywalking - path: /app/skywalking environment: # 获取到密文的docker用户名和密码 DOCKER_USERNAME: from_secret: docker_username @@ -48,7 +48,7 @@ steps: # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh - - cp -r /app/skywalking ./ +# - cp -r /app/skywalking ./ - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_COMMIT_BRANCH | awk '{print $3}') @@ -72,7 +72,7 @@ volumes: - name: maven-build host: path: /home/build/fateverse - - name: skywalking + - name: skywalking-agent host: path: /home/build/skywalking-agent - name: config # k8s对接的配置文件 diff --git a/Dockerfile b/Dockerfile index 172bad7..0ebacdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM azul/zulu-openjdk:11.0.22-jdk VOLUME /tmp RUN useradd -b /home -m -s /bin/bash clay RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay -COPY skywalking /home/clay/skywalking-agent +COPY skywalking-agent /home/clay/skywalking-agent RUN chmod a+xr -R /home/clay/skywalking-agent && chown clay:clay -R /home/clay/skywalking-agent USER clay ARG NAME=$DRONE_COMMIT_BRANCH diff --git a/maven.sh b/maven.sh index 9365d4d..ad0651f 100644 --- a/maven.sh +++ b/maven.sh @@ -30,14 +30,14 @@ batchArr=("admin-biz:admin" batch=${DRONE_COMMIT_BRANCH} ignoreArr=("monitor","sentinel-dashboard-pro","sentinel-dashboard") +rm -rf /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/* if [[ "${ignoreArr[*]}" =~ "${batch}" ]]; then echo "exist"; - cp -r /app/build/skywalking-agent /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent rm -rf /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/* else echo "does not exist"; cp -r /app/build/skywalking-agent /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent - cp agent.config /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/config/agent.config +# cp agent.config /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/config/agent.config fi diff --git a/start.sh b/start.sh index 3fffc9c..30e0e52 100644 --- a/start.sh +++ b/start.sh @@ -45,3 +45,7 @@ echo -e "Check the logs for more details." PID=`ps -ef | grep 'java' | grep "$DRONE_COMMIT_BRANCH.jar" | grep -v 'grep' | awk '{print $2}'` echo -e "The PID Is $PID" + + + +java -javaagent:C:\Users\admin\Desktop\work\study\fateverse\skywalking-agent\skywalking-agent.jar -Dskywalking.agent.service_name=$DRONE_COMMIT_BRANCH -Dskywalking.trace.ignore_path=/actuator/** -Dskywalking.collector.backend_service=10.7.125.151:11800 --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true -jar auth.jar --spring.profiles.active=dev --server.port=8080