clay/fateverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'build : 添加skywalking' (#98) from skywalking into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/98
This commit is contained in:
clay
2024-05-08 14:48:14 +00:00
parent 6d7d4bac9a f6a096fb3e
commit 0fc29c711b
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.drone.yml
View File

@@ -14,6 +14,8 @@ steps:
path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载 path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
- name: maven-build - name: maven-build
path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
- name: skywalking-agent
path: /app/build/skywalking-agent
commands: # 定义在Docker容器中执行的shell命令 commands: # 定义在Docker容器中执行的shell命令
- sed -i 's/$DRONE_COMMIT_BRANCH/'"$DRONE_COMMIT_BRANCH"'/' start.sh - sed -i 's/$DRONE_COMMIT_BRANCH/'"$DRONE_COMMIT_BRANCH"'/' start.sh
- bash maven.sh - bash maven.sh
@@ -25,8 +27,6 @@ steps:
path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
- name: docker - name: docker
path: /var/run/docker.sock # 挂载宿主机的docker path: /var/run/docker.sock # 挂载宿主机的docker
- name: skywalking
path: /app/skywalking
environment: # 获取到密文的docker用户名和密码 environment: # 获取到密文的docker用户名和密码
DOCKER_USERNAME: DOCKER_USERNAME:
from_secret: docker_username from_secret: docker_username
@@ -48,7 +48,7 @@ steps:
# docker登录,不能在脚本中登录,并且不能使用docker login -u -p # docker登录,不能在脚本中登录,并且不能使用docker login -u -p
- echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin
- chmod +x docker.sh - chmod +x docker.sh
- cp -r /app/skywalking ./ # - cp -r /app/skywalking ./
- sh docker.sh - sh docker.sh
# 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足
- docker rmi -f $(docker images | grep $DRONE_COMMIT_BRANCH | awk '{print $3}') - docker rmi -f $(docker images | grep $DRONE_COMMIT_BRANCH | awk '{print $3}')
@@ -72,7 +72,7 @@ volumes:
- name: maven-build - name: maven-build
host: host:
path: /home/build/fateverse path: /home/build/fateverse
- name: skywalking - name: skywalking-agent
host: host:
path: /home/build/skywalking-agent path: /home/build/skywalking-agent
- name: config # k8s对接的配置文件 - name: config # k8s对接的配置文件

2
Dockerfile
View File

@@ -2,7 +2,7 @@ FROM azul/zulu-openjdk:11.0.22-jdk
VOLUME /tmp VOLUME /tmp
RUN useradd -b /home -m -s /bin/bash clay RUN useradd -b /home -m -s /bin/bash clay
RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/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 RUN chmod a+xr -R /home/clay/skywalking-agent && chown clay:clay -R /home/clay/skywalking-agent
USER clay USER clay
ARG NAME=$DRONE_COMMIT_BRANCH ARG NAME=$DRONE_COMMIT_BRANCH

4
maven.sh
View File

@@ -30,14 +30,14 @@ batchArr=("admin-biz:admin"
batch=${DRONE_COMMIT_BRANCH} batch=${DRONE_COMMIT_BRANCH}
ignoreArr=("monitor","sentinel-dashboard-pro","sentinel-dashboard") ignoreArr=("monitor","sentinel-dashboard-pro","sentinel-dashboard")
rm -rf /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/*
if [[ "${ignoreArr[*]}" =~ "${batch}" ]]; then if [[ "${ignoreArr[*]}" =~ "${batch}" ]]; then
echo "exist"; echo "exist";
cp -r /app/build/skywalking-agent /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent
rm -rf /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/* rm -rf /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent/*
else else
echo "does not exist"; echo "does not exist";
cp -r /app/build/skywalking-agent /app/build/$DRONE_COMMIT_BRANCH/skywalking-agent 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 fi

4
start.sh
View File

@@ -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}'` PID=`ps -ef | grep 'java' | grep "$DRONE_COMMIT_BRANCH.jar" | grep -v 'grep' | awk '{print $2}'`
echo -e "The PID Is $PID" 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