From d167c4a2a98ceac18d8908e9594659da539aa895 Mon Sep 17 00:00:00 2001
From: NY <nnn@qq.com>
Date: Wed, 12 Feb 2025 21:55:22 +0800
Subject: [PATCH] first

---
 .drone.yml          | 33 +++++++++++++++++++++++----------
 config/pay_test.ini |  4 ++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c49e1d4..f78a6a2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,7 +25,6 @@ steps:
         path: /workspace
     commands:
       - cd /workspace
-      - pwd
       - git clone http://47.112.165.44:3000/seekm/prdUploader.git
 
   - name: build
@@ -60,17 +59,31 @@ steps:
       - name: docker-sock
         path: /var/run/docker.sock
     commands:
-      - echo "Checking for running container..."
-      - docker stop prduploader:latest || true  # 使用容器名称更可靠
-      - docker rm prduploader:latest || true
-      - echo "Cleaning existing image..."
-      - docker rmi prduploader:latest || true  # 删除旧镜像
+  - name: deploy
+    image: docker:24.0-cli
+    pull: never
+    volumes:
+      - name: shared-folder
+        path: /workspace
+      - name: docker-sock
+        path: /var/run/docker.sock
+    commands:
       - echo "Building Docker image..."
       - cd /workspace/prdUploader
-      - docker rmi prduploader:latest || true
       - docker build -t prduploader:latest .
       - echo "Running Docker container..."
-      - docker run -d -p 11000:11000 prduploader:latest
-      - echo "Deployment finished"
+      - |
+        if docker run -p 11000:11000 prduploader:latest; then
+          echo "Deployment successful, cleaning up old container and image..."
+#          docker stop prduploader:latest || true
+#          docker rm prduploader:latest || true
+#          docker rmi prduploader:latest || true
+        else
+          echo "Deployment failed, keeping old container and image."
+#          docker rmi prduploader:latest || true 
+        fi
       - cd ..
-#      - rm -rf prdUploader
+      - rm -rf prdUploader
+      - echo "Deployment finished"
+
+
diff --git a/config/pay_test.ini b/config/pay_test.ini
index 185d017..1be7b7b 100644
--- a/config/pay_test.ini
+++ b/config/pay_test.ini
@@ -10,7 +10,7 @@ WriteTimeOut = 60
 
 [Rds]
 Type = mysql
-Host = localhost
+Host = 47.112.165.44
 #Host = 192.168.1.181
 Name = epur-pay
 Port = 3307
@@ -30,7 +30,7 @@ SlowThreshold = 100
 Type = redis
 #Host = 8.217.170.205
 #Host = 192.168.1.181
-Host = localhost
+Host = 47.112.165.44
 Port = 6379
 PassWord = `afasdf12313%%%^^^^`
 Name = default