Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile
This commit is contained in:
tzwang 2023-04-26 15:14:35 +08:00
commit 61d758348c
1 changed files with 1 additions and 1 deletions

View File

@ -10,7 +10,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repos
rm -rf /var/cache/apk/*
COPY pcm-ceph /home/
COPY pcm-ceph-rpc /home/
COPY etc/pcmceph.yaml /home/
ENV TZ=Asia/Shanghai