diff --git a/cli/app/errors.go b/cli/app/errors.go index 79425be8..04e7e68d 100644 --- a/cli/app/errors.go +++ b/cli/app/errors.go @@ -13,7 +13,7 @@ import ( "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/recipe" stack "coopcloud.tech/abra/pkg/upstream/stack" - "github.com/docker/docker/api/types" + containerTypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" "github.com/sirupsen/logrus" @@ -97,7 +97,7 @@ func checkErrors(c *cli.Context, cl *dockerClient.Client, app config.App) error filters := filters.NewArgs() filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name)) - containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters}) + containers, err := cl.ContainerList(context.Background(), containerTypes.ListOptions{Filters: filters}) if err != nil { return err } diff --git a/cli/app/logs.go b/cli/app/logs.go index b06634a2..d54dae1e 100644 --- a/cli/app/logs.go +++ b/cli/app/logs.go @@ -15,6 +15,7 @@ import ( "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/upstream/stack" "github.com/docker/docker/api/types" + containerTypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/swarm" dockerClient "github.com/docker/docker/client" @@ -110,7 +111,7 @@ func tailLogs(cl *dockerClient.Client, app config.App, serviceNames []string) er // collected in parallel. wg.Add(1) go func(serviceID string) { - logs, err := cl.ServiceLogs(context.Background(), serviceID, types.ContainerLogsOptions{ + logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{ ShowStderr: true, ShowStdout: !internal.StdErrOnly, Since: internal.SinceLogs, diff --git a/cli/app/ps.go b/cli/app/ps.go index cbe5bb0f..31ab7e61 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -16,7 +16,7 @@ import ( stack "coopcloud.tech/abra/pkg/upstream/stack" "github.com/buger/goterm" dockerFormatter "github.com/docker/cli/cli/command/formatter" - "github.com/docker/docker/api/types" + containerTypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" "github.com/sirupsen/logrus" @@ -103,7 +103,7 @@ func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) { filters := filters.NewArgs() filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name)) - containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters}) + containers, err := cl.ContainerList(context.Background(), containerTypes.ListOptions{Filters: filters}) if err != nil { logrus.Fatal(err) return diff --git a/cli/app/services.go b/cli/app/services.go index 60a7245e..1f76077d 100644 --- a/cli/app/services.go +++ b/cli/app/services.go @@ -11,7 +11,7 @@ import ( "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/service" stack "coopcloud.tech/abra/pkg/upstream/stack" - "github.com/docker/docker/api/types" + containerTypes "github.com/docker/docker/api/types/container" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) @@ -48,7 +48,7 @@ var appServicesCommand = cli.Command{ logrus.Fatal(err) } - containers, err := cl.ContainerList(context.Background(), types.ContainerListOptions{Filters: filters}) + containers, err := cl.ContainerList(context.Background(), containerTypes.ListOptions{Filters: filters}) if err != nil { logrus.Fatal(err) } diff --git a/cli/app/version.go b/cli/app/version.go index 7227ffdd..437976ab 100644 --- a/cli/app/version.go +++ b/cli/app/version.go @@ -10,7 +10,7 @@ import ( "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/abra/pkg/upstream/stack" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/olekukonko/tablewriter" "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/cli/internal/recipe.go b/cli/internal/recipe.go index ede34464..833255ec 100644 --- a/cli/internal/recipe.go +++ b/cli/internal/recipe.go @@ -6,7 +6,7 @@ import ( "coopcloud.tech/abra/pkg/formatter" "coopcloud.tech/abra/pkg/recipe" "github.com/AlecAivazis/survey/v2" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/cli/recipe/release.go b/cli/recipe/release.go index d2da8230..50e0afa7 100644 --- a/cli/recipe/release.go +++ b/cli/recipe/release.go @@ -17,7 +17,7 @@ import ( recipePkg "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/tagcmp" "github.com/AlecAivazis/survey/v2" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/go-git/go-git/v5" "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/cli/recipe/upgrade.go b/cli/recipe/upgrade.go index 4a4a33e2..440859cc 100644 --- a/cli/recipe/upgrade.go +++ b/cli/recipe/upgrade.go @@ -18,7 +18,7 @@ import ( recipePkg "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/tagcmp" "github.com/AlecAivazis/survey/v2" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/pkg/client/registry.go b/pkg/client/registry.go index 0fd1ed63..36d0ea73 100644 --- a/pkg/client/registry.go +++ b/pkg/client/registry.go @@ -6,7 +6,7 @@ import ( "github.com/containers/image/docker" "github.com/containers/image/types" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" ) // GetRegistryTags retrieves all tags of an image from a container registry. diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go index 3fd98191..144742fb 100644 --- a/pkg/compose/compose.go +++ b/pkg/compose/compose.go @@ -12,7 +12,7 @@ import ( "coopcloud.tech/abra/pkg/upstream/stack" loader "coopcloud.tech/abra/pkg/upstream/stack" composetypes "github.com/docker/cli/cli/compose/types" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/pkg/container/container.go b/pkg/container/container.go index 1354b0dd..2717e4e6 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -8,6 +8,7 @@ import ( "coopcloud.tech/abra/pkg/formatter" "github.com/AlecAivazis/survey/v2" "github.com/docker/docker/api/types" + containerTypes "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/sirupsen/logrus" @@ -17,7 +18,7 @@ import ( // count of containers does not match 1, then a prompt is presented to let the // user choose. A count of 0 is handled gracefully. func GetContainer(c context.Context, cl *client.Client, filters filters.Args, noInput bool) (types.Container, error) { - containerOpts := types.ContainerListOptions{Filters: filters} + containerOpts := containerTypes.ListOptions{Filters: filters} containers, err := cl.ContainerList(c, containerOpts) if err != nil { return types.Container{}, err diff --git a/pkg/lint/recipe.go b/pkg/lint/recipe.go index 2e5c8ffe..1fc96f82 100644 --- a/pkg/lint/recipe.go +++ b/pkg/lint/recipe.go @@ -10,7 +10,7 @@ import ( "coopcloud.tech/abra/pkg/recipe" recipePkg "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/tagcmp" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/sirupsen/logrus" diff --git a/pkg/recipe/recipe.go b/pkg/recipe/recipe.go index a5d6d2eb..2ef6327e 100644 --- a/pkg/recipe/recipe.go +++ b/pkg/recipe/recipe.go @@ -23,7 +23,7 @@ import ( "coopcloud.tech/abra/pkg/web" "coopcloud.tech/tagcmp" composetypes "github.com/docker/cli/cli/compose/types" - "github.com/docker/distribution/reference" + "github.com/distribution/reference" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/sirupsen/logrus" diff --git a/pkg/upstream/container/tty.go b/pkg/upstream/container/tty.go index 4686ded5..158aa535 100644 --- a/pkg/upstream/container/tty.go +++ b/pkg/upstream/container/tty.go @@ -9,7 +9,7 @@ import ( "time" "github.com/docker/cli/cli/command" - "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" apiclient "github.com/docker/docker/client" "github.com/moby/sys/signal" @@ -22,7 +22,7 @@ func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id strin return nil } - options := types.ResizeOptions{ + options := container.ResizeOptions{ Height: height, Width: width, }