From 35e165ea036b7ab6f4172b9af97d1b0d64b1ff2e Mon Sep 17 00:00:00 2001
From: Gong <534592533@qq.com>
Date: Mon, 4 Sep 2023 15:27:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml  |  92 ++++++++++++++-----------------
 .drone2.yml | 152 ++++++++++++++--------------------------------------
 2 files changed, 82 insertions(+), 162 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e732f64..c190c3e 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,59 +2,49 @@ kind: pipeline
 type: docker
 
 steps:
-  - name: build
-    image: node:14
-    commands:
-      - npm install
-      - npm run build
+    - name: build
+      image: node:14
+      commands:
+        - npm install
+        - npm run build
 
-  # - name: deploy  # 直接传代码部署
-    # image: plugins/rsync
-    # settings:
-    #   remote_path: /path/to/remote/folder
-    #   host:
-    #     - target-server
-    # when:
-    #   branch:
-    #     - main
+    - name: deploy-push-images
+      image: plugins/docker
+      pull: if-not-exists
+      depends_on:
+        - build
+      settings:
+        repo: gong921123/admin-ui
+        registry: docker.io
+        insecure: true
+        username:
+          from_secret: docker_username
+        password:
+          from_secret: docker_password
+        dockerfile: docker/Dockerfile
+        tags: ${DRONE_TAG}
 
-- name: deploy-push-images
-  image: plugins/docker
-  pull: if-not-exists
-  depends_on:
-    - build
-  settings:
-    repo: gong921123/admin-ui
-    registry: docker.io
-    insecure: true
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    dockerfile: docker/Dockerfile
-    tags: ${DRONE_TAG}
-
-- name: deploy-pull-images
-  image: appleboy/drone-ssh
-  pull: if-not-exists
-  settings:
-    host: gong.cool
-    user:
-      from_secret: ssh_username
-    password:
-      from_secret: ssh_password
-    command_timeout: 5m
-    port: 22
-    script:
-      - echo ====开始部署=======
-      - docker pull gong921123/admin-ui:${DRONE_TAG}
-      - docker stop $(docker ps | grep admin-ui | awk  '{print $1}')
-      - docker rm $(docker ps | grep admin-ui | awk  '{print $1}')
-      - docker rmi $(docker images | grep gong921123/admin-ui | awk  '{print $3}')
-      - docker rmi $(docker images | grep "<none>" | awk  '{print $3}')
-      - docker run -itd --name admin-ui  -p 8002:8002 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/admin-ui:${DRONE_TAG}
-      - echo ====部署成功=======
+    - name: deploy-pull-images
+      image: appleboy/drone-ssh
+      pull: if-not-exists
+      settings:
+        host: gong.cool
+        user:
+          from_secret: ssh_username
+        password:
+          from_secret: ssh_password
+        command_timeout: 5m
+        port: 22
+        script:
+          - echo ====开始部署=======
+          - docker pull gong921123/admin-ui:${DRONE_TAG}
+          - docker stop $(docker ps | grep admin-ui | awk  '{print $1}')
+          - docker rm $(docker ps | grep admin-ui | awk  '{print $1}')
+          - docker rmi $(docker images | grep gong921123/admin-ui | awk  '{print $3}')
+          - docker rmi $(docker images | grep "<none>" | awk  '{print $3}')
+          - docker run -itd --name admin-ui  -p 8002:8002 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/admin-ui:${DRONE_TAG}
+          - echo ====部署成功=======
 
 trigger:
   event:
-  - tag
+    - tag
diff --git a/.drone2.yml b/.drone2.yml
index 216df5d..e732f64 100755
--- a/.drone2.yml
+++ b/.drone2.yml
@@ -1,129 +1,59 @@
 kind: pipeline
-type: kubernetes
-name: publish-testing
-node_selector:
-    youyao/deployment-node: default
-image_pull_secrets:
-  - docker_secret
+type: docker
 
 steps:
-- name: build
-  image: uhub.service.ucloud.cn/yydocker/npm:14.15
-  environment:
-    VUE_APP_WS_BASE_URI: 'admin.yyimgs.com/ws'
-  commands:
-  - "npm config set chromedriver_cdnurl= https://npmmirror.com/mirrors/chromedriver/"
-  - "npm install --registry=https://registry.npmmirror.com"
-  - "npm run build"
- 
-- name: deploy-push-images
-  image: plugins/docker
-  settings:
-    repo: uhub.service.ucloud.cn/yydocker_testing/admin-ui
-    registry: uhub.service.ucloud.cn
-    username:
-      from_secret: yy_docker_username
-    password:
-      from_secret: yy_docker_password
-    dockerfile: docker/Dockerfile
-    tags: latest
-- name: deploy-pull-images
-  image: uhub.service.ucloud.cn/drone/ssh
-  settings:
-    host: 'kubectl-server'
-    username:
-      from_secret: ssh_username
-    key:
-      from_secret: ssh_key
-    script:
-      - "kubectl -n testing rollout restart deployment admin"
+  - name: build
+    image: node:14
+    commands:
+      - npm install
+      - npm run build
 
-trigger:
-  branch:
-  - develop
-  event:
-  - push
-
----
-kind: pipeline
-type: kubernetes
-name: publish-staging
-node_selector:
-    youyao/deployment-node: default
-image_pull_secrets:
-  - docker_secret
-
-steps:
-
-- name: build
-  image: uhub.service.ucloud.cn/yydocker/npm:14.15
-  environment:
-    VUE_APP_WS_BASE_URI: 'admin.prod.yyimgs.com/ws'
-  commands:
-  - "npm config set chromedriver_cdnurl= https://npmmirror.com/mirrors/chromedriver/"
-  - "npm install --registry=https://registry.npmmirror.com"
-  - "npm run build:prod"
+  # - name: deploy  # 直接传代码部署
+    # image: plugins/rsync
+    # settings:
+    #   remote_path: /path/to/remote/folder
+    #   host:
+    #     - target-server
+    # when:
+    #   branch:
+    #     - main
 
 - name: deploy-push-images
   image: plugins/docker
+  pull: if-not-exists
+  depends_on:
+    - build
   settings:
-    repo: uhub.service.ucloud.cn/yydocker_staging/admin-ui
-    registry: uhub.service.ucloud.cn
+    repo: gong921123/admin-ui
+    registry: docker.io
+    insecure: true
     username:
-      from_secret: yy_docker_username
+      from_secret: docker_username
     password:
-      from_secret: yy_docker_password
+      from_secret: docker_password
     dockerfile: docker/Dockerfile
-    tags: latest
+    tags: ${DRONE_TAG}
+
 - name: deploy-pull-images
-  image: uhub.service.ucloud.cn/drone/ssh
+  image: appleboy/drone-ssh
+  pull: if-not-exists
   settings:
-    host: 'kubectl-server'
-    username:
+    host: gong.cool
+    user:
       from_secret: ssh_username
-    key:
-      from_secret: ssh_key
-    script:
-      - "kubectl -n staging rollout restart deployment admin"
-
-
-trigger:
-  branch:
-  - release
-  event:
-  - push
-  
----
-kind: pipeline
-type: kubernetes
-name: publish-prod
-node_selector:
-    youyao/deployment-node: default
-image_pull_secrets:
-  - docker_secret
-
-steps:
-
-- name: build
-  image: uhub.service.ucloud.cn/yydocker/npm:14.15
-  environment:
-    VUE_APP_WS_BASE_URI: 'admin.youyao99.com/ws'
-  commands:
-  - "npm config set chromedriver_cdnurl= https://npmmirror.com/mirrors/chromedriver/"
-  - "npm install --registry=https://registry.npmmirror.com"
-  - "npm run build:prod"
-
-- name: deploy
-  image: plugins/docker
-  settings:
-    repo: uhub.service.ucloud.cn/yydocker_prod/admin-ui
-    registry: uhub.service.ucloud.cn
-    auto_tag: true
-    username:
-      from_secret: yy_docker_username
     password:
-      from_secret: yy_docker_password
-    dockerfile: docker/Dockerfile
+      from_secret: ssh_password
+    command_timeout: 5m
+    port: 22
+    script:
+      - echo ====开始部署=======
+      - docker pull gong921123/admin-ui:${DRONE_TAG}
+      - docker stop $(docker ps | grep admin-ui | awk  '{print $1}')
+      - docker rm $(docker ps | grep admin-ui | awk  '{print $1}')
+      - docker rmi $(docker images | grep gong921123/admin-ui | awk  '{print $3}')
+      - docker rmi $(docker images | grep "<none>" | awk  '{print $3}')
+      - docker run -itd --name admin-ui  -p 8002:8002 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/admin-ui:${DRONE_TAG}
+      - echo ====部署成功=======
 
 trigger:
   event: