diff --git a/.drone.yml b/.drone.yml index 3e2ecfb..ec6dd43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline # 定义一个管道 type: docker # 当前管道的类型 -name: build-test1 # 当前管道的名称 +name: build # 当前管道的名称 steps: # 定义管道的执行步骤 - name: build-project # 步骤名称 @@ -23,24 +23,32 @@ steps: # 定义管道的执行步骤 from_secret: docker_passwd dockerfile: Dockerfile registry: https://git.hiiragi.club:8081 - repo: git.hiiragi.club:8081/mol/test -# steps: -# - name: deploy-project -# image: appleboy/drone-ssh -# settings: -# host: www.hiiragi.club -# username: -# from_secret: deploy_username # 使用secrets -# password: -# from_secret: deploy_password -# port: 22 -# command_timeout: 2m -# script: -# - echo ==-----==开始部署==-----== -# - docker pull soulweapon/test1:latest -# - docker-compose -p test1 down -# # - docker volume rm xxx # 有挂载卷轴的记得卸载 -# - docker-compose -f /home/ubuntu/compose-file/test1.yml -p test1 up -d -# # 过滤出dockerImages的id, 删除none镜像 -# - docker rmi $(docker images | grep test1 | grep none | awk '{print $3}') -# - echo ==-----==部署成功==-----== + repo: git.hiiragi.club:8081/mol/middle-server + +kind: pipeline +type: docker +name: deploy + +steps: + - name: deploy-project + image: appleboy/drone-ssh + settings: + host: + from_secret: host + username: + from_secret: server_username # 使用secrets + key: + from_secret: server_key + port: 22 + command_timeout: 2m + secrets: [docker_username, docker_passwd] + script: + - echo ==-----==开始部署==-----== + - pwd + - docker login -u $docker_username -p $docker_passwd git.hiiragi.club:8081 + - docker pull git.hiiragi.club:8081/mol/middle-server + - list=$(docker ps -a| grep middle-server* | awk '{print $1}') + - test "$list" = "" && echo "none middle-server containers running" || docker stop $list + # 过滤出dockerImages的id, 删除none镜像 + - docker run -d -p 15000:80 --name=middle-server-${DRONE_BUILD_NUMBER} git.hiiragi.club:8081/mol/middle-server + - echo ==-----==部署成功==-----== diff --git a/Dockerfile b/Dockerfile index 620fe57..777312b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app COPY package*.json ./ -RUN npm install +# RUN npm install COPY . .