From bec75ca99eeea448162af0e428e41f7c204e008e Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 8 May 2024 21:35:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?build=20:=20=E6=B7=BB=E5=8A=A0skywalking?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f1d8d41..3dec36a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -74,7 +74,7 @@ volumes: path: /home/build/fateverse - name: skywalking host: - path: /home/skywalking-agent + path: /home/build/skywalking-agent - name: config # k8s对接的配置文件 host: path: /home/kubect From 5e9db3a8d6ec55570be62ac52bdec4536955d67b Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 8 May 2024 13:52:11 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2a0715a..b355716 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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}') From ecf55ed8567993816a0d5a98b8475513632d5bc7 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 8 May 2024 14:00:52 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e387f60..172bad7 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 /app/skywalking /home/clay/skywalking-agent +COPY skywalking /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