ci(drone): 更新 master-machine服务器配置和部署流程

- 修改服务器地址和用户
- 新增 Docker 镜像构建和推送步骤
- 更新 Docker Compose部署方式
- 注释掉宝宝服务器2的配置

.drone.yml

@@ -4,22 +4,38 @@ type: ssh
 name: master-machine
 
 server:
-  host: 103.214.174.197:31245
-  user: ubuntu
+  host: 38.38.251.113:31245
+  user: root
   password:
     from_secret: www_password
+
 clone:
   depth: 1
 
 steps:
-  - name: clean old container
+  - name: build new image
+    environment:
+      DOCKER_LOGIN:
+        from_secret: docker_login
+      DOCKER_PASSWORD:
+        from_secret: docker_password
     commands:
-      - docker ps -a | (grep -q kami_boss; [ $? -eq 0 ] && docker container stop kami_boss && docker container rm kami_boss) || true
+      - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_LOGIN --password-stdin docker.kkknametrans.buzz
+      - docker build -t docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
+      - docker tag docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:latest
+      - docker push docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
+      - docker push docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:latest
+      - docker logout docker.kkknametrans.buzz
   - name: deploy to docker compose
+    environment:
+      DOCKER_LOGIN:
+        from_secret: docker_login
+      DOCKER_PASSWORD:
+        from_secret: docker_password
     commands:
-      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml down
-      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml up -d
-
+      - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_LOGIN --password-stdin docker.kkknametrans.buzz
+      - BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yml --profile boss up -d
+      - docker logout docker.kkknametrans.buzz
 trigger:
   branch:
     - develop
@@ -134,38 +150,38 @@ trigger:
 #    event:
 #      - push
 
----
-kind: pipeline
-type: ssh
-name: 宝宝服务器2
-
-server:
-  host: 38.180.189.206
-  user: root
-  password:
-    from_secret: baby2
-
-clone:
-  depth: 1
-
-steps:
-  - name: clean old container
-    commands:
-      - docker ps -a | (grep -q kami_boss; [ $? -eq 0 ] && docker container stop kami_boss && docker container rm kami_boss) || true
-  - name: run docker compose
-    commands:
-      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml down
-      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml up -d
-
-trigger:
-  status:
-    - success
-    - failure
-  branch:
-    - production
-  when:
-    event:
-      - push
+#---
+#kind: pipeline
+#type: ssh
+#name: 宝宝服务器2
+#
+#server:
+#  host: 38.180.189.206
+#  user: root
+#  password:
+#    from_secret: baby2
+#
+#clone:
+#  depth: 1
+#
+#steps:
+#  - name: clean old container
+#    commands:
+#      - docker ps -a | (grep -q kami_boss; [ $? -eq 0 ] && docker container stop kami_boss && docker container rm kami_boss) || true
+#  - name: run docker compose
+#    commands:
+#      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml down
+#      - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22306 CONTAINER=kami_boss docker compose -f ./deploy/docker-compose.yaml up -d
+#
+#trigger:
+#  status:
+#    - success
+#    - failure
+#  branch:
+#    - production
+#  when:
+#    event:
+#      - push
 
 #---
 #kind: pipeline