From 1b51ca72bae36a803ab3a1725ad32b4be063747c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E6=AD=A6?= <875892894@qq.com>
Date: Thu, 1 Aug 2024 15:55:24 +0800
Subject: [PATCH] test

---
 .drone.yml    | 47 +++++++++++++++++++++--------------------------
 Dockerfile    |  8 ++++++++
 nginxDev.conf | 28 ++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 26 deletions(-)
 create mode 100644 nginxDev.conf

diff --git a/.drone.yml b/.drone.yml
index e7e11b8..976736e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,32 +20,27 @@ steps:
       event: push
       branch: develop
 
-  - name: scp
-    image: appleboy/drone-scp
-    settings:
-      host:
-        from_secret: host194
-      port: 22
-      user: root
-      password:
-        from_secret: 194pwd
-      target: /data/nfs/data/tmp/h5admin
-      source:
-        - dist/*
-  - name: backup
+  - name: docker-dev
+    image: plugins/docker
+    repo: registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller-web
+    registry: registry.cn-shenzhen.aliyuncs.com
+    use_cache: true
+    dockerfile: DockerfileDev
+    secrets: [ docker_username, docker_password ]
+    tags: bkb-admin-web
+    when:
+      branch: develop
+      
+  - name: deploy-dev
     image: appleboy/drone-ssh
-    settings:
-      host:
-        from_secret: host194
-      username: root
-      password:
-        from_secret: 194pwd
-      port: 22
-      script:
-        - tar -czPf /data/nfs/data/backup/h5admin.`date +%Y-%m-%d:%H:%M`.tar.gz /data/nfs/data/newh5admin
-        # - \cp -rf /data/nfs/data/tmp/h5admin/dist/* /data/nfs/data/newh5admin
-        - rsync --delete -ahrc /data/nfs/data/tmp/h5admin/dist/ /data/nfs/data/newh5admin/
-
+    host: 1.92.109.79
+    username: root
+    password: 
+      from_secret: ssh_password
+    port: 22 # 可选，指定 SSH 端口，默认为 22
+    script:
+      - docker rm -f bkb-admin-web
+      - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller-web:bkb-admin-web
+      - docker run --name=bkb-admin-web -p 30101:83 -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller-web:bkb-admin-web
     when:
-      event: push
       branch: develop
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e69de29..53be5e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM registry.cn-shanghai.aliyuncs.com/lj-go/nginx
+LABEL maintainer "wenwu"
+
+WORKDIR /react
+COPY . /react
+COPY dist /usr/share/nginx/html/
+COPY nginxDev.conf /etc/nginx/conf.d/default.conf
+EXPOSE 83
\ No newline at end of file
diff --git a/nginxDev.conf b/nginxDev.conf
new file mode 100644
index 0000000..9b724ce
--- /dev/null
+++ b/nginxDev.conf
@@ -0,0 +1,28 @@
+server {
+    listen       83;
+    root         /usr/share/nginx/html/;
+    include /etc/nginx/default.d/*.conf;
+
+
+    location / {
+      index index.html index.htm;
+      error_page 405 =200 /index.html;
+      try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+      proxy_pass    http://121.36.90.209:30010/;
+    }
+
+    location /minio/ {
+      proxy_pass    https://ax-api.sumweal.com/minio/;
+    }
+
+    error_page 404 /404.html;
+        location = /40x.html {
+    }
+
+    error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+    }
+}
\ No newline at end of file