Merge pull request #18 from portainer/fix/EE-1975/image-name-not-available

fix(download-plugin): Image name not available when using watchtower or similar EE-1975

Author: chaogeng77977

compose/internal/composeplugin/composeplugin.go

@@ -40,22 +40,22 @@ func NewPluginWrapper(binaryPath, configPath string) (libstack.Deployer, error)
 	}
 
 	dockerPluginsPath := path.Join(configPath, "cli-plugins")
-	if !utils.IsBinaryPresent(utils.ProgramPath(dockerPluginsPath, "docker-compose")) {
-		pluginPath := utils.ProgramPath(binaryPath, "docker-compose.plugin")
-		if !utils.IsBinaryPresent(pluginPath) {
-			return nil, MissingDockerComposePluginErr
+	pluginPath := utils.ProgramPath(binaryPath, "docker-compose.plugin")
+
+	if utils.IsBinaryPresent(pluginPath) {
+		if !utils.IsBinaryPresent(utils.ProgramPath(dockerPluginsPath, "docker-compose")) {
+			err := os.MkdirAll(dockerPluginsPath, 0755)
+			if err != nil {
+				return nil, errors.WithMessage(err, "failed creating plugins path")
+			}
 		}
 
-		err := os.MkdirAll(dockerPluginsPath, 0755)
-		if err != nil {
-			return nil, errors.WithMessage(err, "failed creating plugins path")
-		}
-
-		err = utils.Copy(pluginPath, utils.ProgramPath(dockerPluginsPath, "docker-compose"))
+		err := utils.Move(pluginPath, utils.ProgramPath(dockerPluginsPath, "docker-compose"))
 		if err != nil {
 			return nil, err
 		}
-
+	} else if !utils.IsBinaryPresent(utils.ProgramPath(dockerPluginsPath, "docker-compose")) {
+		return nil, MissingDockerComposePluginErr
 	}
 
 	return &PluginWrapper{binaryPath: binaryPath, configPath: configPath}, nil

compose/internal/utils/utils.go

@@ -45,3 +45,16 @@ func Copy(sourcePath, destinationPath string) error {
 
 	return nil
 }
+
+// Move sourcePath to destinationPath
+func Move(sourcePath, destinationPath string) error {
+	if err := Copy(sourcePath, destinationPath); err != nil {
+		return err
+	}
+
+	if err := os.Remove(sourcePath); err != nil {
+		return err
+	}
+
+	return nil
+}