diff --git a/.drone.yml b/.drone.yml index 14ceefa..b3728fe 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:8080 -v /mnt/data/opt/dev-server/.local:/root/.local /mnt/data/opt/dev-server/.config:/root/.config -v /mnt/data/opt/dev-server/project:/project -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 run -d -p 18000:8080 -v /mnt/data/opt/dev-server/.local:/root/.local /mnt/data/opt/dev-server/.config:/root/.config -v /mnt/data/opt/dev-server/project:/app/project -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 5231a16..fbb3297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app COPY . . -VOLUME [ "/project", "/root/.ssh", "/root/.local", "/root/.config" ] +VOLUME [ "/app/project", "/root/.ssh", "/root/.local", "/root/.config" ] # 运行时可以添加代理 ARG PROXY @@ -84,6 +84,7 @@ RUN echo "安装 code-server" && \ apt update && \ # apt-get install -y build-essential pkg-config python3 && \ apt install -y pkg-config && \ + npm install --global npm@^8 && \ npm config set python python3 && \ npm install --global code-server --unsafe-perm diff --git a/docker-entry-point.sh b/docker-entry-point.sh index b450067..257ad42 100755 --- a/docker-entry-point.sh +++ b/docker-entry-point.sh @@ -29,4 +29,6 @@ fi service ssh start >> /app/info.log ssh-agent bash >> /app/info.log +cat /app/info.log + code-server