feat:
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
mol
2024-01-28 09:20:21 +08:00
parent b1ca77a046
commit 3d60320ccf
2 changed files with 3 additions and 1 deletions

View File

@ -60,6 +60,6 @@ steps:
- list=$(docker ps -a | grep my-dev-server* | awk '{print $1}') - list=$(docker ps -a | grep my-dev-server* | awk '{print $1}')
- test "$list" = "" && echo "none my-dev-server containers running" || docker stop $list && docker container rm $list - test "$list" = "" && echo "none my-dev-server containers running" || docker stop $list && docker container rm $list
# 过滤出dockerImages的id, 删除none镜像 # 过滤出dockerImages的id, 删除none镜像
- docker run -d -p 18000:22 -v /mnt/data/opt/dev-server/.vscode-server:/root/.vscode-server -v /mnt/data/opt/dev-server/data:/data -v /mnt/data/opt/dev-server/.ssh:/root/.ssh -e ROOT_PASSWD=heiyu518 -e GIT_USER=mol -e GIT_EMAIL=hiiragi10073@163.com -e DOCKER_USER=mol10073 -e DOCKER_PASSWD=5opmbU2YvhTMwB --restart=always --name=my-dev-server git.liliyamol.cn:8081/mol/my-dev-server:latest - docker run -d -p 18000:22 -v /mnt/data/opt/dev-server/.vscode-server:/root/.vscode-server -v /mnt/data/opt/dev-server/data:/data -v /mnt/data/opt/dev-server/.ssh:/root/.ssh -e ROOT_PASSWD=heiyu518 -e GIT_USER=mol -e GIT_EMAIL=hiiragi10073@163.com -e DOCKER_USER=mol10073 -e DOCKER_PASSWD=5opmbU2YvhTMwB -e http_proxy=http://192.168.124.12:7890 -e https_proxy=http://192.168.124.12:7890 --restart=always --name=my-dev-server git.liliyamol.cn:8081/mol/my-dev-server:latest
- docker rmi $(docker images | grep "none" | awk '{print $3}') - docker rmi $(docker images | grep "none" | awk '{print $3}')
- echo ==-----==部署成功==-----== - echo ==-----==部署成功==-----==

View File

@ -17,6 +17,8 @@ RUN echo "安装基础工具与配置文件" && \
echo ${PROXY} && \ echo ${PROXY} && \
export http_proxy=${PROXY} && \ export http_proxy=${PROXY} && \
export https_proxy=${PROXY} && \ export https_proxy=${PROXY} && \
# 设置shell
echo -e "set meta-flag on \nset convert-meta off \nset input-meta on \nset output-meta on" > /root/.inputrc && \
apt-get update && \ apt-get update && \
# 时区 # 时区
apt-get install -y tzdata && \ apt-get install -y tzdata && \