lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod: Try and update things

Browse Source 
No idea why things break. go.mod sucks.
This commit is contained in:
James Shubin
2023-11-27 20:05:01 -05:00
parent e727e7adb6
commit dad3458ece
5 changed files with 175 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/resources/docker_container.go
View File

@@ -349,9 +349,12 @@ func (obj *DockerContainerRes) containerStart(ctx context.Context, id string, op
}
// containerStop stops the specified container and waits for it to stop.
func (obj *DockerContainerRes) containerStop(ctx context.Context, id string, timeout *time.Duration) error {
func (obj *DockerContainerRes) containerStop(ctx context.Context, id string, timeout *int) error {
ch, errCh := obj.client.ContainerWait(ctx, id, container.WaitConditionNotRunning)
obj.client.ContainerStop(ctx, id, timeout)
stopOpts := container.StopOptions{
Timeout: timeout,
}
obj.client.ContainerStop(ctx, id, stopOpts)
select {
case <-ch:
case err := <-errCh:

3
engine/resources/docker_container_test.go
View File

@@ -193,7 +193,8 @@ func cleanup() error {
}
if len(l) > 0 {
if err := res.client.ContainerStop(ctx, id, nil); err != nil {
stopOpts := container.StopOptions{}
if err := res.client.ContainerStop(ctx, id, stopOpts); err != nil {
return fmt.Errorf("error stopping container: %s", err)
}
if err := res.client.ContainerRemove(ctx, id, types.ContainerRemoveOptions{}); err != nil {