Skip to content

Commit

Permalink
fix(deps): Update module github.com/docker/docker to v24 [SECURITY] (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
candiduslynx authored Nov 1, 2023
1 parent b37d95f commit d420203
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/apache/arrow/go/v14 v14.0.0-20231031200323-c49e24273160
github.com/avast/retry-go/v4 v4.5.0
github.com/cloudquery/cloudquery-api-go v1.4.2
github.com/docker/docker v20.10.26+incompatible
github.com/docker/docker v24.0.7+incompatible
github.com/docker/go-connections v0.4.0
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.26+incompatible h1:yhVdEnGdYdwRo2RAGciZU3P55Y7XH/ybb5A3L1d1rDE=
github.com/docker/docker v20.10.26+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand Down
12 changes: 6 additions & 6 deletions managedplugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ const (
containerServerHealthyRetries = 30
containerServerHealthyInitialRetryDelay = 100 * time.Millisecond

containerStopTimeout = 10 * time.Second
containerStopTimeoutSeconds = 10
)

// PluginType specifies if a plugin is a source or a destination
// it actually doesn't really have any effect as plugins can serve both as source and as destinations
// but it is here for backward compatibility
// PluginType specifies if a plugin is a source or a destination.
// It actually doesn't really have any effect as plugins can serve both as source and as destinations,
// but it is here for backward compatibility.
type PluginType int

const (
Expand Down Expand Up @@ -583,8 +583,8 @@ func (c *Client) Terminate() error {
if err != nil {
return fmt.Errorf("failed to create Docker client: %w", err)
}
timeout := containerStopTimeout
if err := cli.ContainerStop(context.Background(), c.containerID, &timeout); err != nil {
timeout := containerStopTimeoutSeconds
if err := cli.ContainerStop(context.Background(), c.containerID, container.StopOptions{Timeout: &timeout}); err != nil {
return fmt.Errorf("failed to stop container: %w", err)
}
if err := cli.ContainerRemove(context.Background(), c.containerID, types.ContainerRemoveOptions{}); err != nil {
Expand Down

0 comments on commit d420203

Please sign in to comment.