diff options
Diffstat (limited to 'cmd/dendrite-upgrade-tests/main.go')
| -rw-r--r-- | cmd/dendrite-upgrade-tests/main.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go index 6390666a..871a605d 100644 --- a/cmd/dendrite-upgrade-tests/main.go +++ b/cmd/dendrite-upgrade-tests/main.go @@ -408,7 +408,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI } containerID = body.ID - err = dockerClient.ContainerStart(ctx, containerID, types.ContainerStartOptions{}) + err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{}) if err != nil { return "", "", fmt.Errorf("failed to ContainerStart: %s", err) } @@ -440,7 +440,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI lastErr = nil break } - logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{ + logs, err := dockerClient.ContainerLogs(context.Background(), containerID, container.LogsOptions{ ShowStdout: true, ShowStderr: true, Follow: true, @@ -461,7 +461,7 @@ func runImage(dockerClient *client.Client, volumeName string, branchNameToImageI } func destroyContainer(dockerClient *client.Client, containerID string) { - err := dockerClient.ContainerRemove(context.TODO(), containerID, types.ContainerRemoveOptions{ + err := dockerClient.ContainerRemove(context.TODO(), containerID, container.RemoveOptions{ Force: true, }) if err != nil { @@ -548,7 +548,7 @@ func verifyTests(dockerClient *client.Client, volumeName string, versions []*sem // cleanup old containers/volumes from a previous run func cleanup(dockerClient *client.Client) { // ignore all errors, we are just cleaning up and don't want to fail just because we fail to cleanup - containers, _ := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{ + containers, _ := dockerClient.ContainerList(context.Background(), container.ListOptions{ Filters: label(dendriteUpgradeTestLabel), All: true, }) @@ -556,7 +556,7 @@ func cleanup(dockerClient *client.Client) { log.Printf("Removing container: %v %v\n", c.ID, c.Names) timeout := 1 _ = dockerClient.ContainerStop(context.Background(), c.ID, container.StopOptions{Timeout: &timeout}) - _ = dockerClient.ContainerRemove(context.Background(), c.ID, types.ContainerRemoveOptions{ + _ = dockerClient.ContainerRemove(context.Background(), c.ID, container.RemoveOptions{ Force: true, }) } |