diff --git a/.drone.yml b/.drone.yml index 26721b5..3824d3f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,6 +60,6 @@ steps: - 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 # 过滤出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}') - echo ==-----==部署成功==-----== diff --git a/Dockerfile b/Dockerfile index 74a84a1..194df3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ RUN echo "安装基础工具与配置文件" && \ echo ${PROXY} && \ export http_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 install -y tzdata && \