Greening (#763)

pg-sharding · Sep 10, 2024 · 3313a65 · 3313a65
1 parent ee97a26
commit 3313a65
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/test/feature/testutil/docker_composer.go b/test/feature/testutil/docker_composer.go
@@ -211,7 +211,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
-	execCfg := types.ExecConfig{
+	execCfg := container.ExecOptions{
 		AttachStdout: true,
 		AttachStderr: true,
 		Cmd:          []string{shell, "-c", cmd},
@@ -220,7 +220,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du
 	if err != nil {
 		return 0, "", err
 	}
-	attachResp, err := dc.api.ContainerExecAttach(ctx, execResp.ID, types.ExecStartCheck{})
+	attachResp, err := dc.api.ContainerExecAttach(ctx, execResp.ID, container.ExecStartOptions{})
 	if err != nil {
 		return 0, "", err
 	}
@@ -234,7 +234,7 @@ func (dc *DockerComposer) RunCommand(service string, cmd string, timeout time.Du
 	if err != nil {
 		return 0, "", err
 	}
-	var insp types.ContainerExecInspect
+	var insp container.ExecInspect
 	Retry(func() bool {
 		insp, err = dc.api.ContainerExecInspect(ctx, execResp.ID)
 		return err != nil || !insp.Running
@@ -254,15 +254,15 @@ func (dc *DockerComposer) RunAsyncCommand(service string, cmd string) error {
 	if !ok {
 		return fmt.Errorf("no such service: %s", service)
 	}
-	execCfg := types.ExecConfig{
+	execCfg := container.ExecOptions{
 		Detach: true,
 		Cmd:    []string{shell, "-c", cmd},
 	}
 	execResp, err := dc.api.ContainerExecCreate(context.Background(), cont.ID, execCfg)
 	if err != nil {
 		return err
 	}
-	return dc.api.ContainerExecStart(context.Background(), execResp.ID, types.ExecStartCheck{})
+	return dc.api.ContainerExecStart(context.Background(), execResp.ID, container.ExecStartOptions{})
 }
 
 // GetFile returns content of the fail from continer by path