Merge pull request #31 from yuzd/dev

v7.4.6
yuzd · Oct 9, 2022 · 901a038 · 901a038
2 parents c076c04 + fb87245
commit 901a038
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 3 deletions.
diff --git a/AntDeploy2022/AntDeployV2/AntDeployWinform.dll b/AntDeploy2022/AntDeployV2/AntDeployWinform.dll
diff --git a/AntDeploy2022/AntDeployV2/en/AntDeployWinform.resources.dll b/AntDeploy2022/AntDeployV2/en/AntDeployWinform.resources.dll
diff --git a/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest b/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="AntDeployV2.7c9b7525-17b5-4862-91fd-75e80893e476" Version="2.5" Language="en-US" Publisher="yuzd" />
+        <Identity Id="AntDeployV2.7c9b7525-17b5-4862-91fd-75e80893e476" Version="2.6" Language="en-US" Publisher="yuzd" />
         <DisplayName>AntDeployV2</DisplayName>
         <Description xml:space="preserve">Tools to deploy applications to remote server(iis,windowsService,docker) support netframwork and dotnetcore,support rollback and increment deploy</Description>
         <MoreInfo>https://github.com/yuzd</MoreInfo>

diff --git a/AntDeploy2022/AntDeployV2/zh-CN/AntDeployWinform.resources.dll b/AntDeploy2022/AntDeployV2/zh-CN/AntDeployWinform.resources.dll
diff --git a/AntDeploy2022/AntDeployV2/zh-Hans/AntDeployWinform.resources.dll b/AntDeploy2022/AntDeployV2/zh-Hans/AntDeployWinform.resources.dll
diff --git a/AntDeploy2022/AntDeployV2/zh/AntDeployWinform.resources.dll b/AntDeploy2022/AntDeployV2/zh/AntDeployWinform.resources.dll
diff --git a/AntDeployAgent/Operation/OperationTypes/OperationsDocker.cs b/AntDeployAgent/Operation/OperationTypes/OperationsDocker.cs
@@ -302,7 +302,7 @@ public override void Start()
 
 
                 CopyHelper.RunCommand($"{model.Sudo} docker rmi {uploadImageName}");
-
+                CopyHelper.RunCommand($"{model.Sudo} docker rmi {currentImageInfo.Item3}");
                 if (!rr11)
                 {
                     throw new Exception("[upload image] - Fail");

diff --git a/AntDeployWinform/Util/SSHClient.cs b/AntDeployWinform/Util/SSHClient.cs
@@ -1216,8 +1216,11 @@ public void DoDockerCommand(string publishFolder, bool isrollBack = false,bool i
                 else
                 {
                     _logger($"[upload image] - Success", LogLevel.Info);
+
                 }
                 _sshClient.RunCommand($"{Sudo} docker rmi {uploadImageName}");
+                // 删除打包好的镜像
+                _sshClient.RunCommand($"{Sudo} docker rmi {currentImageInfo.Item3}");
             }
 
             try

diff --git a/AntDeployWinform/Vsix.cs b/AntDeployWinform/Vsix.cs
@@ -3,7 +3,7 @@
     public static class Vsix
     {
         public const string FORM_NAME = "AntDeploy("+VERSION+")";
-        public const string VERSION = "7.45";
+        public const string VERSION = "7.46";
         public const string AGENTVERSION = "7.1";
         public const string PRODUCT = "yuzd";
         public const string PACKAGE = "AntDeploy";