Merge pull request #16 from portainer/feat/EE-1332/pull-image-when-redeploy-stack

feat:(image): support pull image EE-1332

Author: Hao Zhang

compose/internal/composebinary/composebinary.go

@@ -51,6 +51,17 @@ func (wrapper *ComposeWrapper) Remove(ctx context.Context, workingDir, host, pro
 	return err
 }
 
+// Pull an image associated with a service defined in a docker-compose.yml or docker-stack.yml file,
+// but does not start containers based on those images.
+func (wrapper *ComposeWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error {
+	output, err := wrapper.Command(newPullCommand(filePaths), workingDir, host, projectName, "")
+	if len(output) != 0 {
+		log.Printf("[libstack,composebinary] [message: finish deploying] [output: %s] [err: %s]", output, err)
+	}
+
+	return err
+}
+
 // Command executes a docker-compose command
 func (wrapper *ComposeWrapper) Command(command composeCommand, workingDir, host, projectName, envFilePath string) ([]byte, error) {
 	program := utils.ProgramPath(wrapper.binaryPath, "docker-compose")
@@ -111,6 +122,10 @@ func newDownCommand(filePaths []string) composeCommand {
 	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
 }
 
+func newPullCommand(filePaths []string) composeCommand {
+	return newCommand([]string{"pull"}, filePaths)
+}
+
 func (command *composeCommand) WithProjectName(projectName string) {
 	command.args = append(command.args, "-p", projectName)
 }

compose/internal/composeplugin/composeplugin.go

@@ -81,6 +81,17 @@ func (wrapper *PluginWrapper) Remove(ctx context.Context, workingDir, host, proj
 	return err
 }
 
+// Pull images
+func (wrapper *PluginWrapper) Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error {
+	output, err := wrapper.command(newPullCommand(filePaths), workingDir, host, projectName, "")
+	if len(output) != 0 {
+		log.Printf("[libstack,composebinary] [message: finish pulling] [output: %s] [err: %s]", output, err)
+	}
+
+	return err
+}
+
+
 // Command exectue a docker-compose commanåd
 func (wrapper *PluginWrapper) command(command composeCommand, workingDir, url, projectName, envFilePath string) ([]byte, error) {
 	program := utils.ProgramPath(wrapper.binaryPath, "docker")
@@ -146,6 +157,10 @@ func newDownCommand(filePaths []string) composeCommand {
 	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
 }
 
+func newPullCommand(filePaths []string) composeCommand {
+	return newCommand([]string{"pull"}, filePaths)
+}
+
 func (command *composeCommand) WithConfigPath(configPath string) {
 	command.args = append(command.args, "--config", configPath)
 }

libstack.go

@@ -7,4 +7,5 @@ import (
 type Deployer interface {
 	Deploy(ctx context.Context, workingDir, host, projectName string, filePaths []string, envFilePath string) error
 	Remove(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
+	Pull(ctx context.Context, workingDir, host, projectName string, filePaths []string) error
 }