From 6fab99f402e624b0667f9c04a7eb9760fd924599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 9 Aug 2024 15:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC3.6.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                      |  4 ++--
 src/main/resources/deploy.sh | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef114f2..de8737f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>com.muyu</groupId>
         <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>cloud-system</artifactId>
 
-    <version>1.0.0</version>
+    <version>3.6.5</version>
 
     <description>
         cloud-system系统模块
diff --git a/src/main/resources/deploy.sh b/src/main/resources/deploy.sh
index 229262a..ed0adee 100644
--- a/src/main/resources/deploy.sh
+++ b/src/main/resources/deploy.sh
@@ -29,9 +29,16 @@ fi
 
 export image="$imageName:$imageTag"
 
-if docker images | grep "$image"; then
-  echo "镜像 $image 已存在,开始删除!"
-  docker rmi -f $image
+if docker ps -a -f "name=$imageName" | grep "$imageName"; then
+  echo "容器 $imageName 已存在,开始删除!"
+  docker rm -f $imageName
+else
+  echo "容器 $imageName 不存在!"
+fi
+
+if docker images | grep "$imageName"; then
+  echo "镜像 $imageName 已存在,开始删除!"
+  docker rmi $image
 else
   echo "镜像 $image 不存在,开始创建!"
   docker pull "127.0.0.1:16000/$image"
@@ -39,15 +46,6 @@ else
   docker rmi -f "127.0.0.1:16000/$image"
 fi
 
-if docker ps -a -f "name=$imageName" | grep "$imageName"; then
-  echo "容器 $imageName 已存在,开始删除!"
-  docker rm -f $imageName
-else
-  echo "容器 $imageName 不存在,开始创建!"
-fi
-
-
-
 docker run -d \
  --name $imageName \
  --network dev-cloud \