Skip to content

chore: bump dependencies #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 11, 2025
Merged

chore: bump dependencies #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f275115
chore(deps): bump github.com/coder/coder/v2 from 2.14.4 to 2.23.0
dependabot[bot] Aug 28, 2025
54d8012
chore(deps): consolidate dependabot updates and bump Go to 1.24.10
sreya Nov 11, 2025
51fcd96
Merge branch 'main' into deps/consolidate-dependabot-updates
sreya Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cli/clitest/fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"

dockertypes "github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
testingexec "k8s.io/utils/exec/testing"

"github.com/coder/envbox/dockerutil"
Expand Down Expand Up @@ -43,7 +44,7 @@ func NewFakeDockerClient() dockerutil.Client {
}, nil
}

client.ContainerExecAttachFn = func(_ context.Context, _ string, _ dockertypes.ExecStartCheck) (dockertypes.HijackedResponse, error) {
client.ContainerExecAttachFn = func(_ context.Context, _ string, _ containertypes.ExecAttachOptions) (dockertypes.HijackedResponse, error) {
return dockertypes.HijackedResponse{
Reader: bufio.NewReader(strings.NewReader("root:x:0:0:root:/root:/bin/bash")),
Conn: &net.IPConn{},
Expand Down
15 changes: 8 additions & 7 deletions cli/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"testing"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/common"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/network"
Expand Down Expand Up @@ -311,7 +312,7 @@ func TestDocker(t *testing.T) {

// Set the exec response from inspecting the image to some ID
// greater than 0.
client.ContainerExecAttachFn = func(_ context.Context, _ string, _ dockertypes.ExecStartCheck) (dockertypes.HijackedResponse, error) {
client.ContainerExecAttachFn = func(_ context.Context, _ string, _ container.ExecAttachOptions) (dockertypes.HijackedResponse, error) {
return dockertypes.HijackedResponse{
Reader: bufio.NewReader(strings.NewReader("root:x:1001:1001:root:/root:/bin/bash")),
Conn: &net.IPConn{},
Expand Down Expand Up @@ -444,23 +445,23 @@ func TestDocker(t *testing.T) {
statExecID = "hi"
)

client.ContainerExecCreateFn = func(_ context.Context, _ string, config dockertypes.ExecConfig) (dockertypes.IDResponse, error) {
client.ContainerExecCreateFn = func(_ context.Context, _ string, config container.ExecOptions) (common.IDResponse, error) {
if config.Cmd[0] == "stat" {
return dockertypes.IDResponse{
return common.IDResponse{
ID: statExecID,
}, nil
}
return dockertypes.IDResponse{}, nil
return common.IDResponse{}, nil
}

// Set the exec response from inspecting the image to some ID
// greater than 0.
client.ContainerExecInspectFn = func(_ context.Context, execID string) (dockertypes.ContainerExecInspect, error) {
client.ContainerExecInspectFn = func(_ context.Context, execID string) (container.ExecInspect, error) {
if execID == statExecID {
return dockertypes.ContainerExecInspect{ExitCode: 1}, nil
return container.ExecInspect{ExitCode: 1}, nil
}

return dockertypes.ContainerExecInspect{}, nil
return container.ExecInspect{}, nil
}

var called bool
Expand Down
58 changes: 32 additions & 26 deletions dockerutil/dockerfake/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import (
"strings"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/common"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/api/types/system"
dockerclient "github.com/docker/docker/client"
specs "github.com/opencontainers/image-spec/specs-go/v1"

"github.com/coder/envbox/dockerutil"
Expand All @@ -24,12 +26,12 @@ var _ dockerutil.Client = MockClient{}
type MockClient struct {
ImagePullFn func(_ context.Context, ref string, options image.PullOptions) (io.ReadCloser, error)
ContainerCreateFn func(_ context.Context, config *containertypes.Config, hostConfig *containertypes.HostConfig, networkingConfig *networktypes.NetworkingConfig, _ *specs.Platform, containerName string) (containertypes.CreateResponse, error)
ImagePruneFn func(_ context.Context, pruneFilter filters.Args) (dockertypes.ImagesPruneReport, error)
ImagePruneFn func(_ context.Context, pruneFilter filters.Args) (image.PruneReport, error)
ContainerStartFn func(_ context.Context, container string, options containertypes.StartOptions) error
ContainerExecAttachFn func(_ context.Context, execID string, config dockertypes.ExecStartCheck) (dockertypes.HijackedResponse, error)
ContainerExecCreateFn func(_ context.Context, container string, config dockertypes.ExecConfig) (dockertypes.IDResponse, error)
ContainerExecStartFn func(_ context.Context, execID string, config dockertypes.ExecStartCheck) error
ContainerExecInspectFn func(_ context.Context, execID string) (dockertypes.ContainerExecInspect, error)
ContainerExecAttachFn func(_ context.Context, execID string, config containertypes.ExecAttachOptions) (dockertypes.HijackedResponse, error)
ContainerExecCreateFn func(_ context.Context, container string, config containertypes.ExecOptions) (common.IDResponse, error)
ContainerExecStartFn func(_ context.Context, execID string, config containertypes.ExecAttachOptions) error
ContainerExecInspectFn func(_ context.Context, execID string) (containertypes.ExecInspect, error)
ContainerInspectFn func(_ context.Context, container string) (dockertypes.ContainerJSON, error)
ContainerRemoveFn func(_ context.Context, container string, options containertypes.RemoveOptions) error
PingFn func(_ context.Context) (dockertypes.Ping, error)
Expand All @@ -51,23 +53,27 @@ func (MockClient) ImageCreate(_ context.Context, _ string, _ image.CreateOptions
panic("not implemented")
}

func (MockClient) ImageHistory(_ context.Context, _ string) ([]image.HistoryResponseItem, error) {
func (MockClient) ImageHistory(_ context.Context, _ string, _ ...dockerclient.ImageHistoryOption) ([]image.HistoryResponseItem, error) {
panic("not implemented")
}

func (MockClient) ImageImport(_ context.Context, _ image.ImportSource, _ string, _ image.ImportOptions) (io.ReadCloser, error) {
panic("not implemented")
}

func (MockClient) ImageInspectWithRaw(_ context.Context, _ string) (dockertypes.ImageInspect, []byte, error) {
func (MockClient) ImageInspect(_ context.Context, _ string, _ ...dockerclient.ImageInspectOption) (image.InspectResponse, error) {
panic("not implemented")
}

func (MockClient) ImageInspectWithRaw(_ context.Context, _ string) (image.InspectResponse, []byte, error) {
panic("not implemented")
}

func (MockClient) ImageList(_ context.Context, _ image.ListOptions) ([]image.Summary, error) {
panic("not implemented")
}

func (MockClient) ImageLoad(_ context.Context, _ io.Reader, _ bool) (dockertypes.ImageLoadResponse, error) {
func (MockClient) ImageLoad(_ context.Context, _ io.Reader, _ ...dockerclient.ImageLoadOption) (image.LoadResponse, error) {
panic("not implemented")
}

Expand All @@ -86,26 +92,26 @@ func (MockClient) ImageRemove(_ context.Context, _ string, _ image.RemoveOptions
panic("not implemented")
}

func (MockClient) ImageSearch(_ context.Context, _ string, _ dockertypes.ImageSearchOptions) ([]registry.SearchResult, error) {
func (MockClient) ImageSearch(_ context.Context, _ string, _ registry.SearchOptions) ([]registry.SearchResult, error) {
panic("not implemented")
}

func (MockClient) ImageSave(_ context.Context, _ []string) (io.ReadCloser, error) {
func (MockClient) ImageSave(_ context.Context, _ []string, _ ...dockerclient.ImageSaveOption) (io.ReadCloser, error) {
panic("not implemented")
}

func (MockClient) ImageTag(_ context.Context, _ string, _ string) error {
panic("not implemented")
}

func (m MockClient) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (dockertypes.ImagesPruneReport, error) {
func (m MockClient) ImagesPrune(ctx context.Context, pruneFilter filters.Args) (image.PruneReport, error) {
if m.ImagePruneFn == nil {
return dockertypes.ImagesPruneReport{}, nil
return image.PruneReport{}, nil
}
return m.ImagePruneFn(ctx, pruneFilter)
}

func (MockClient) Events(_ context.Context, _ dockertypes.EventsOptions) (<-chan events.Message, <-chan error) {
func (MockClient) Events(_ context.Context, _ events.ListOptions) (<-chan events.Message, <-chan error) {
panic("not implemented")
}

Expand Down Expand Up @@ -147,23 +153,23 @@ func (MockClient) ContainerDiff(_ context.Context, _ string) ([]containertypes.F
panic("not implemented")
}

func (m MockClient) ContainerExecAttach(ctx context.Context, execID string, config dockertypes.ExecStartCheck) (dockertypes.HijackedResponse, error) {
func (m MockClient) ContainerExecAttach(ctx context.Context, execID string, config containertypes.ExecAttachOptions) (dockertypes.HijackedResponse, error) {
if m.ContainerExecAttachFn == nil {
return dockertypes.HijackedResponse{}, nil
}
return m.ContainerExecAttachFn(ctx, execID, config)
}

func (m MockClient) ContainerExecCreate(ctx context.Context, name string, config dockertypes.ExecConfig) (dockertypes.IDResponse, error) {
func (m MockClient) ContainerExecCreate(ctx context.Context, name string, config containertypes.ExecOptions) (common.IDResponse, error) {
if m.ContainerExecCreateFn == nil {
return dockertypes.IDResponse{}, nil
return common.IDResponse{}, nil
}
return m.ContainerExecCreateFn(ctx, name, config)
}

func (m MockClient) ContainerExecInspect(ctx context.Context, id string) (dockertypes.ContainerExecInspect, error) {
func (m MockClient) ContainerExecInspect(ctx context.Context, id string) (containertypes.ExecInspect, error) {
if m.ContainerExecInspectFn == nil {
return dockertypes.ContainerExecInspect{
return containertypes.ExecInspect{
Pid: 123,
}, nil
}
Expand All @@ -175,7 +181,7 @@ func (MockClient) ContainerExecResize(_ context.Context, _ string, _ containerty
panic("not implemented")
}

func (m MockClient) ContainerExecStart(ctx context.Context, execID string, config dockertypes.ExecStartCheck) error {
func (m MockClient) ContainerExecStart(ctx context.Context, execID string, config containertypes.ExecAttachOptions) error {
if m.ContainerExecStartFn == nil {
return nil
}
Expand All @@ -201,7 +207,7 @@ func (MockClient) ContainerKill(_ context.Context, _ string, _ string) error {
panic("not implemented")
}

func (MockClient) ContainerList(_ context.Context, _ containertypes.ListOptions) ([]dockertypes.Container, error) {
func (MockClient) ContainerList(_ context.Context, _ containertypes.ListOptions) ([]containertypes.Summary, error) {
panic("not implemented")
}

Expand Down Expand Up @@ -232,11 +238,11 @@ func (MockClient) ContainerRestart(_ context.Context, _ string, _ containertypes
panic("not implemented")
}

func (MockClient) ContainerStatPath(_ context.Context, _ string, _ string) (dockertypes.ContainerPathStat, error) {
func (MockClient) ContainerStatPath(_ context.Context, _ string, _ string) (containertypes.PathStat, error) {
panic("not implemented")
}

func (MockClient) ContainerStats(_ context.Context, _ string, _ bool) (dockertypes.ContainerStats, error) {
func (MockClient) ContainerStats(_ context.Context, _ string, _ bool) (containertypes.StatsResponseReader, error) {
panic("not implemented")
}

Expand Down Expand Up @@ -267,18 +273,18 @@ func (MockClient) ContainerWait(_ context.Context, _ string, _ containertypes.Wa
panic("not implemented")
}

func (MockClient) CopyFromContainer(_ context.Context, _ string, _ string) (io.ReadCloser, dockertypes.ContainerPathStat, error) {
func (MockClient) CopyFromContainer(_ context.Context, _ string, _ string) (io.ReadCloser, containertypes.PathStat, error) {
panic("not implemented")
}

func (MockClient) CopyToContainer(_ context.Context, _ string, _ string, _ io.Reader, _ dockertypes.CopyToContainerOptions) error {
func (MockClient) CopyToContainer(_ context.Context, _ string, _ string, _ io.Reader, _ containertypes.CopyToContainerOptions) error {
panic("not implemented")
}

func (MockClient) ContainersPrune(_ context.Context, _ filters.Args) (dockertypes.ContainersPruneReport, error) {
func (MockClient) ContainersPrune(_ context.Context, _ filters.Args) (containertypes.PruneReport, error) {
panic("not implemented")
}

func (MockClient) ContainerStatsOneShot(_ context.Context, _ string) (dockertypes.ContainerStats, error) {
func (MockClient) ContainerStatsOneShot(_ context.Context, _ string) (containertypes.StatsResponseReader, error) {
panic("not implemented")
}
3 changes: 1 addition & 2 deletions dockerutil/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"io"
"time"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"golang.org/x/xerrors"

Expand Down Expand Up @@ -41,7 +40,7 @@ func ExecContainer(ctx context.Context, client Client, config ExecConfig) ([]byt
return nil, xerrors.Errorf("exec create: %w", err)
}

resp, err := client.ContainerExecAttach(ctx, exec.ID, dockertypes.ExecStartCheck{})
resp, err := client.ContainerExecAttach(ctx, exec.ID, container.ExecAttachOptions{})
if err != nil {
return nil, xerrors.Errorf("attach to exec: %w", err)
}
Expand Down
5 changes: 2 additions & 3 deletions dockerutil/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"strings"
"time"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
Expand Down Expand Up @@ -126,12 +125,12 @@ func PullImage(ctx context.Context, config *PullImageConfig) error {
}

// PruneImage runs a simple 'docker prune'.
func PruneImages(ctx context.Context, client Client) (dockertypes.ImagesPruneReport, error) {
func PruneImages(ctx context.Context, client Client) (image.PruneReport, error) {
report, err := client.ImagesPrune(ctx,
filters.NewArgs(filters.Arg("dangling", "false")),
)
if err != nil {
return dockertypes.ImagesPruneReport{}, xerrors.Errorf("images prune: %w", err)
return image.PruneReport{}, xerrors.Errorf("images prune: %w", err)
}

return report, nil
Expand Down
Loading
Loading