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}') 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