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

Merge pull request 'gateway' (#94) from gateway into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/94
This commit is contained in:
clay
2024-05-08 14:08:43 +00:00
parent 4789cd2dad ecf55ed856
commit 6d7d4bac9a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

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

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 /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 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