Skip to content

Commit 592fd88

Browse files
committed
update docker fake
1 parent 0a1c938 commit 592fd88

File tree

4 files changed

+4
-285
lines changed

4 files changed

+4
-285
lines changed

cli/docker.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"strconv"
1414
"strings"
1515

16-
dockertypes "github.com/docker/docker/api/types"
1716
"github.com/docker/docker/api/types/container"
1817
"github.com/google/go-containerregistry/pkg/name"
1918
"github.com/spf13/cobra"
@@ -664,7 +663,7 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Docker
664663
// TODO fix iptables when istio detected.
665664

666665
blog.Info("Starting up workspace...")
667-
err = client.ContainerStart(ctx, containerID, dockertypes.ContainerStartOptions{})
666+
err = client.ContainerStart(ctx, containerID, container.StartOptions{})
668667
if err != nil {
669668
return xerrors.Errorf("start container: %w", err)
670669
}

dockerutil/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88

99
"github.com/cpuguy83/dockercfg"
10-
dockertypes "github.com/docker/docker/api/types"
10+
"github.com/docker/docker/api/types/registry"
1111
dockerclient "github.com/docker/docker/client"
1212

1313
"golang.org/x/xerrors"
@@ -38,7 +38,7 @@ func Client(ctx context.Context) (DockerClient, error) {
3838
return client.(DockerClient), nil
3939
}
4040

41-
type AuthConfig dockertypes.AuthConfig
41+
type AuthConfig registry.AuthConfig
4242

4343
func (a AuthConfig) Base64() (string, error) {
4444
authStr, err := json.Marshal(a)

dockerutil/dockerfake/client.go

Lines changed: 0 additions & 281 deletions
This file was deleted.

dockerutil/dockerfake/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// Package dockerfake contains logic for mocking out Docker-related
22
// functionality.
3+
//go:generate mockgen -destination ./mock.go -package dockerfake github.com/coder/envbox/dockerutil/dockerfake Client
34
package dockerfake

0 commit comments

Comments
 (0)