From 4c6280b0e983d318e34498e3ffdc82b616ee8ed0 Mon Sep 17 00:00:00 2001 From: Chris Crone Date: Fri, 21 Aug 2020 17:24:53 +0200 Subject: [PATCH] Rename docker/api -> docker/compose-cli Signed-off-by: Chris Crone --- CHANGELOG.md | 4 +- Dockerfile | 6 +-- README.md | 6 +-- aci/aci.go | 12 +++--- aci/backend.go | 20 +++++----- aci/backend_test.go | 2 +- aci/context.go | 4 +- aci/context_test.go | 2 +- aci/convert/container.go | 2 +- aci/convert/container_test.go | 2 +- aci/convert/convert.go | 6 +-- aci/convert/convert_test.go | 4 +- aci/convert/ports.go | 2 +- aci/convert/ports_test.go | 2 +- aci/convert/registry_credentials.go | 2 +- aci/convert/volume.go | 2 +- aci/login/client.go | 2 +- aci/login/login.go | 2 +- aci/login/storage_helper.go | 2 +- aci/resource_group.go | 2 +- backend/backend.go | 10 ++--- cli/cmd/compose/compose.go | 4 +- cli/cmd/compose/convert.go | 2 +- cli/cmd/compose/down.go | 4 +- cli/cmd/compose/logs.go | 2 +- cli/cmd/compose/ps.go | 2 +- cli/cmd/compose/up.go | 4 +- cli/cmd/context/create.go | 4 +- cli/cmd/context/create_aci.go | 8 ++-- cli/cmd/context/create_ecs.go | 8 ++-- cli/cmd/context/inspect.go | 2 +- cli/cmd/context/ls.go | 8 ++-- cli/cmd/context/rm.go | 4 +- cli/cmd/context/show.go | 4 +- cli/cmd/context/use.go | 4 +- cli/cmd/exec.go | 4 +- cli/cmd/inspect.go | 4 +- cli/cmd/inspect_test.go | 4 +- cli/cmd/login/azurelogin.go | 2 +- cli/cmd/login/login.go | 8 ++-- cli/cmd/logout/azure.go | 4 +- cli/cmd/logout/logout.go | 2 +- cli/cmd/logs.go | 4 +- cli/cmd/ps.go | 6 +-- cli/cmd/ps_test.go | 4 +- cli/cmd/rm.go | 6 +-- cli/cmd/run/run.go | 8 ++-- cli/cmd/secrets.go | 4 +- cli/cmd/secrets_test.go | 2 +- cli/cmd/serve.go | 10 ++--- cli/cmd/start.go | 4 +- cli/cmd/stop.go | 4 +- cli/cmd/version.go | 4 +- cli/config/flags.go | 2 +- cli/formatter/container.go | 2 +- cli/formatter/container_test.go | 2 +- cli/main.go | 34 ++++++++-------- cli/main_test.go | 10 ++--- cli/mobycli/exec.go | 4 +- cli/mobycli/exec_test.go | 2 +- cli/options/options.go | 4 +- cli/options/run/opts.go | 6 +-- cli/options/run/opts_test.go | 2 +- client/client.go | 14 +++---- client/compose.go | 4 +- client/containers.go | 4 +- client/secrets.go | 4 +- config/config.go | 2 +- containers/api.go | 2 +- context/cloud/api.go | 2 +- context/store/store.go | 2 +- context/store/store_test.go | 2 +- ecs/backend.go | 16 ++++---- ecs/cloudformation.go | 2 +- ecs/cloudformation_test.go | 2 +- ecs/context.go | 4 +- ecs/convert.go | 2 +- ecs/list.go | 2 +- ecs/sdk.go | 4 +- ecs/secrets.go | 2 +- ecs/secrets/main/main.go | 2 +- ecs/wait.go | 2 +- example/backend.go | 12 +++--- go.mod | 2 +- import-restrictions.yaml | 48 +++++++++++------------ local/backend.go | 12 +++--- local/e2e/backend_test.go | 2 +- metrics/metrics.go | 2 +- progress/tty.go | 2 +- protos/compose/v1/compose.pb.go | 8 ++-- protos/compose/v1/compose.proto | 2 +- protos/containers/v1/containers.pb.go | 9 +++-- protos/containers/v1/containers.proto | 2 +- protos/contexts/v1/contexts.pb.go | 8 ++-- protos/contexts/v1/contexts.proto | 2 +- protos/streams/v1/streams.pb.go | 9 +++-- protos/streams/v1/streams.proto | 2 +- server/interceptor.go | 10 ++--- server/interceptor_test.go | 4 +- server/proxy/containers.go | 8 ++-- server/proxy/containers_test.go | 6 +-- server/proxy/contexts.go | 6 +-- server/proxy/proxy.go | 12 +++--- server/proxy/streams.go | 4 +- server/proxy/streams/io.go | 2 +- server/proxy/streams/logs.go | 2 +- server/proxy/streams/logs_test.go | 2 +- server/proxy/streams/stream.go | 2 +- server/proxy/streams/stream_test.go | 2 +- tests/aci-e2e/e2e-aci_test.go | 14 +++---- tests/aci-e2e/storage/storage.go | 4 +- tests/e2e/e2e_test.go | 2 +- tests/ecs-e2e/e2e-ecs_test.go | 5 +-- tests/framework/e2e.go | 2 +- tests/framework/unit.go | 4 +- tests/skip-win-ci-e2e/skip_win_ci_test.go | 2 +- 116 files changed, 299 insertions(+), 298 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c3d41eb..f995fd5ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ Release headlines ### Known issues * -[Release diff](https://github.com/docker/api/compare/...) +[Release diff](https://github.com/docker/compose-cli/compare/...) --> ## 0.1.4 - 2020-06-26 @@ -34,7 +34,7 @@ This release includes: * A gRPC API for managing contexts and Azure containers ### Known issues -* Mapping a container port to a different host port is not supported in ACI (i.e.: `docker run -p 80:8080`). You can only expose the container port to the same port on the host. +* Mapping a container port to a different host port is not supported in ACI (i.e.: `docker run -p 80:8080`). You can only expose the container port to the same port on the host. * Exec currently only allows interactive sessions with a terminal (`exec -t`), not specify commands in the command line. * `docker run` detaches from the container by default, even if `-d` is not specified. Logs can be seen later on with command `docker log `. * Replicas are not supported when deploying Compose application. One container will be run for each Compose service. Several services cannot expose the same port. diff --git a/Dockerfile b/Dockerfile index f890a1d32..0825feeb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GO_VERSION=1.15.0-alpine ARG GOLANGCI_LINT_VERSION=v1.30.0-alpine FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base -WORKDIR /api +WORKDIR /compose-cli ENV GO111MODULE=on RUN apk add --no-cache \ git \ @@ -77,7 +77,7 @@ RUN --mount=target=. \ make BINARY=/out/docker -f builder.Makefile cross FROM scratch AS protos -COPY --from=make-protos /api/protos . +COPY --from=make-protos /compose-cli/protos . FROM scratch AS cli COPY --from=make-cli /out/* . @@ -96,7 +96,7 @@ RUN --mount=target=. \ make -f builder.Makefile test FROM base as check-license-headers -RUN go get -u github.com/kunalkushwaha/ltag +RUN go get -u github.com/kunalkushwaha/ltag RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ make -f builder.Makefile check-license-headers diff --git a/README.md b/README.md index 1ddd20bee..09c318289 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Docker API -[![Actions Status](https://github.com/docker/api/workflows/Continuous%20integration/badge.svg)](https://github.com/docker/api/actions) +[![Actions Status](https://github.com/docker/compose-cli/workflows/Continuous%20integration/badge.svg)](https://github.com/docker/compose-cli/actions) ## Dev Setup @@ -48,7 +48,7 @@ make e2e-local ``` This requires a local Docker Engine running -Local ACI E2E tests: +Local ACI E2E tests: ``` AZURE_TENANT_ID="xxx" AZURE_CLIENT_ID="yyy" AZURE_CLIENT_SECRET="yyy" make e2e-aci ``` @@ -66,7 +66,7 @@ You can also run a single ACI test from the test suite: AZURE_TENANT_ID="xxx" AZURE_CLIENT_ID="yyy" AZURE_CLIENT_SECRET="yyy" make E2E_TEST=TestContainerRun e2e-aci ``` -Local ECS E2E tests: +Local ECS E2E tests: ``` TEST_AWS_PROFILE=myProfile TEST_AWS_REGION=eu-west-3 make e2e-ecs ``` diff --git a/aci/aci.go b/aci/aci.go index c22994d75..429fed77c 100644 --- a/aci/aci.go +++ b/aci/aci.go @@ -33,12 +33,12 @@ import ( "github.com/morikuni/aec" "github.com/pkg/errors" - "github.com/docker/api/aci/convert" - "github.com/docker/api/aci/login" - "github.com/docker/api/containers" - "github.com/docker/api/context/store" - "github.com/docker/api/errdefs" - "github.com/docker/api/progress" + "github.com/docker/compose-cli/aci/convert" + "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/progress" ) func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { diff --git a/aci/backend.go b/aci/backend.go index 9f015f71f..fcfcc1c01 100644 --- a/aci/backend.go +++ b/aci/backend.go @@ -32,16 +32,16 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/docker/api/aci/convert" - "github.com/docker/api/aci/login" - "github.com/docker/api/backend" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/cloud" - "github.com/docker/api/context/store" - "github.com/docker/api/errdefs" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/aci/convert" + "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/backend" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/secrets" ) const ( diff --git a/aci/backend_test.go b/aci/backend_test.go index affc031f5..cea120bc2 100644 --- a/aci/backend_test.go +++ b/aci/backend_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/mock" "gotest.tools/v3/assert" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) func TestGetContainerName(t *testing.T) { diff --git a/aci/context.go b/aci/context.go index 86ade3a87..21784f2fc 100644 --- a/aci/context.go +++ b/aci/context.go @@ -27,8 +27,8 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/docker/api/context/store" - "github.com/docker/api/prompt" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/prompt" ) type contextCreateACIHelper struct { diff --git a/aci/context_test.go b/aci/context_test.go index 1ee90259a..d5b50a8f3 100644 --- a/aci/context_test.go +++ b/aci/context_test.go @@ -28,7 +28,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/context/store" ) type contextMocks struct { diff --git a/aci/convert/container.go b/aci/convert/container.go index 742e7f7e1..561e6083a 100644 --- a/aci/convert/container.go +++ b/aci/convert/container.go @@ -22,7 +22,7 @@ import ( "github.com/compose-spec/compose-go/types" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) // ContainerToComposeProject convert container config to compose project diff --git a/aci/convert/container_test.go b/aci/convert/container_test.go index 947890832..8c10b5c73 100644 --- a/aci/convert/container_test.go +++ b/aci/convert/container_test.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/types" "gotest.tools/v3/assert" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) func TestConvertContainerEnvironment(t *testing.T) { diff --git a/aci/convert/convert.go b/aci/convert/convert.go index 01de9b5f4..0d0ea4255 100644 --- a/aci/convert/convert.go +++ b/aci/convert/convert.go @@ -31,9 +31,9 @@ import ( "github.com/compose-spec/compose-go/types" "github.com/pkg/errors" - "github.com/docker/api/aci/login" - "github.com/docker/api/containers" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/store" ) const ( diff --git a/aci/convert/convert_test.go b/aci/convert/convert_test.go index 7394efdd8..e648bb1b7 100644 --- a/aci/convert/convert_test.go +++ b/aci/convert/convert_test.go @@ -27,8 +27,8 @@ import ( "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" - "github.com/docker/api/containers" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/store" ) var convertCtx = store.AciContext{ diff --git a/aci/convert/ports.go b/aci/convert/ports.go index 6c0f70906..6111ed590 100644 --- a/aci/convert/ports.go +++ b/aci/convert/ports.go @@ -21,7 +21,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) // ToPorts converts Azure container ports to api ports diff --git a/aci/convert/ports_test.go b/aci/convert/ports_test.go index 60ef948bf..6a7ce80d7 100644 --- a/aci/convert/ports_test.go +++ b/aci/convert/ports_test.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "gotest.tools/v3/assert" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) func TestPortConvert(t *testing.T) { diff --git a/aci/convert/registry_credentials.go b/aci/convert/registry_credentials.go index 964db78ae..77220815d 100644 --- a/aci/convert/registry_credentials.go +++ b/aci/convert/registry_credentials.go @@ -36,7 +36,7 @@ import ( "github.com/docker/cli/cli/config/types" "github.com/pkg/errors" - "github.com/docker/api/aci/login" + "github.com/docker/compose-cli/aci/login" ) // Specific username from ACR docs : https://github.com/Azure/acr/blob/master/docs/AAD-OAuth.md#getting-credentials-programatically diff --git a/aci/convert/volume.go b/aci/convert/volume.go index bdda13618..cfffca598 100644 --- a/aci/convert/volume.go +++ b/aci/convert/volume.go @@ -24,7 +24,7 @@ import ( "github.com/compose-spec/compose-go/types" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) // GetRunVolumes return volume configurations for a project and a single service diff --git a/aci/login/client.go b/aci/login/client.go index 6175fd2fd..b9dc7c891 100644 --- a/aci/login/client.go +++ b/aci/login/client.go @@ -26,7 +26,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/pkg/errors" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) const userAgent = "docker-cli" diff --git a/aci/login/login.go b/aci/login/login.go index f7bacdc02..51d3a79de 100644 --- a/aci/login/login.go +++ b/aci/login/login.go @@ -33,7 +33,7 @@ import ( "github.com/pkg/errors" "golang.org/x/oauth2" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) //go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff diff --git a/aci/login/storage_helper.go b/aci/login/storage_helper.go index 2cc5d59b2..0da3bd2a5 100644 --- a/aci/login/storage_helper.go +++ b/aci/login/storage_helper.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/context/store" ) // StorageAccountHelper helper for Azure Storage Account diff --git a/aci/resource_group.go b/aci/resource_group.go index e5f623f5c..6340ba03e 100644 --- a/aci/resource_group.go +++ b/aci/resource_group.go @@ -23,7 +23,7 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/preview/preview/subscription/mgmt/subscription" "github.com/pkg/errors" - "github.com/docker/api/aci/login" + "github.com/docker/compose-cli/aci/login" ) // ResourceGroupHelper interface to manage resource groups and subscription IDs diff --git a/backend/backend.go b/backend/backend.go index c060352c7..8f3a36014 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -23,11 +23,11 @@ import ( "github.com/sirupsen/logrus" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - "github.com/docker/api/context/cloud" - "github.com/docker/api/errdefs" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/secrets" ) var ( diff --git a/cli/cmd/compose/compose.go b/cli/cmd/compose/compose.go index 98658d41e..7fa21f077 100644 --- a/cli/cmd/compose/compose.go +++ b/cli/cmd/compose/compose.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/errdefs" ) type composeOptions struct { diff --git a/cli/cmd/compose/convert.go b/cli/cmd/compose/convert.go index 8c214912f..29fab6b77 100644 --- a/cli/cmd/compose/convert.go +++ b/cli/cmd/compose/convert.go @@ -23,7 +23,7 @@ import ( "github.com/compose-spec/compose-go/cli" "github.com/spf13/cobra" - "github.com/docker/api/client" + "github.com/docker/compose-cli/client" ) func convertCommand() *cobra.Command { diff --git a/cli/cmd/compose/down.go b/cli/cmd/compose/down.go index 1a013901e..935e9547d 100644 --- a/cli/cmd/compose/down.go +++ b/cli/cmd/compose/down.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/progress" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/progress" ) func downCommand() *cobra.Command { diff --git a/cli/cmd/compose/logs.go b/cli/cmd/compose/logs.go index ccd4ea521..88af47ec7 100644 --- a/cli/cmd/compose/logs.go +++ b/cli/cmd/compose/logs.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" + "github.com/docker/compose-cli/client" ) func logsCommand() *cobra.Command { diff --git a/cli/cmd/compose/ps.go b/cli/cmd/compose/ps.go index 236eac5a1..df0e93936 100644 --- a/cli/cmd/compose/ps.go +++ b/cli/cmd/compose/ps.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" + "github.com/docker/compose-cli/client" ) func psCommand() *cobra.Command { diff --git a/cli/cmd/compose/up.go b/cli/cmd/compose/up.go index 2519777c6..f3b7dff43 100644 --- a/cli/cmd/compose/up.go +++ b/cli/cmd/compose/up.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/progress" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/progress" ) func upCommand() *cobra.Command { diff --git a/cli/cmd/context/create.go b/cli/cmd/context/create.go index 6c9b4eab8..01f2383cc 100644 --- a/cli/cmd/context/create.go +++ b/cli/cmd/context/create.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/cli/mobycli" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/cli/mobycli" + "github.com/docker/compose-cli/context/store" ) type descriptionCreateOpts struct { diff --git a/cli/cmd/context/create_aci.go b/cli/cmd/context/create_aci.go index a2cba9610..32ebb3e9c 100644 --- a/cli/cmd/context/create_aci.go +++ b/cli/cmd/context/create_aci.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/aci" - "github.com/docker/api/client" - "github.com/docker/api/context/store" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/aci" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/errdefs" ) func init() { diff --git a/cli/cmd/context/create_ecs.go b/cli/cmd/context/create_ecs.go index 43ec3a622..b40287f57 100644 --- a/cli/cmd/context/create_ecs.go +++ b/cli/cmd/context/create_ecs.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/context/store" - "github.com/docker/api/ecs" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/ecs" + "github.com/docker/compose-cli/errdefs" ) func init() { diff --git a/cli/cmd/context/inspect.go b/cli/cmd/context/inspect.go index bc8af24b8..0a939c654 100644 --- a/cli/cmd/context/inspect.go +++ b/cli/cmd/context/inspect.go @@ -17,7 +17,7 @@ package context import ( - "github.com/docker/api/cli/mobycli" + "github.com/docker/compose-cli/cli/mobycli" "github.com/spf13/cobra" ) diff --git a/cli/cmd/context/ls.go b/cli/cmd/context/ls.go index 910c371a3..754957ea8 100644 --- a/cli/cmd/context/ls.go +++ b/cli/cmd/context/ls.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/cli/mobycli" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" - "github.com/docker/api/formatter" + "github.com/docker/compose-cli/cli/mobycli" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/formatter" ) type lsOpts struct { diff --git a/cli/cmd/context/rm.go b/cli/cmd/context/rm.go index 2a7e5e2ad..9cc085151 100644 --- a/cli/cmd/context/rm.go +++ b/cli/cmd/context/rm.go @@ -25,8 +25,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/spf13/cobra" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" ) type removeOpts struct { diff --git a/cli/cmd/context/show.go b/cli/cmd/context/show.go index 937e8342e..a12aa3076 100644 --- a/cli/cmd/context/show.go +++ b/cli/cmd/context/show.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" ) func showCommand() *cobra.Command { diff --git a/cli/cmd/context/use.go b/cli/cmd/context/use.go index 961468238..b972e7628 100644 --- a/cli/cmd/context/use.go +++ b/cli/cmd/context/use.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/config" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/config" + "github.com/docker/compose-cli/context/store" ) func useCommand() *cobra.Command { diff --git a/cli/cmd/exec.go b/cli/cmd/exec.go index cc089123a..13644d126 100644 --- a/cli/cmd/exec.go +++ b/cli/cmd/exec.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/containers" ) type execOpts struct { diff --git a/cli/cmd/inspect.go b/cli/cmd/inspect.go index e26b7c9f4..6eac9fb3b 100644 --- a/cli/cmd/inspect.go +++ b/cli/cmd/inspect.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/formatter" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/formatter" ) // InspectCommand inspects into containers diff --git a/cli/cmd/inspect_test.go b/cli/cmd/inspect_test.go index a477a0129..20acff972 100644 --- a/cli/cmd/inspect_test.go +++ b/cli/cmd/inspect_test.go @@ -22,8 +22,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/golden" - _ "github.com/docker/api/example" - "github.com/docker/api/tests/framework" + _ "github.com/docker/compose-cli/example" + "github.com/docker/compose-cli/tests/framework" ) func TestInspectId(t *testing.T) { diff --git a/cli/cmd/login/azurelogin.go b/cli/cmd/login/azurelogin.go index 433ad5501..e05933ba4 100644 --- a/cli/cmd/login/azurelogin.go +++ b/cli/cmd/login/azurelogin.go @@ -19,7 +19,7 @@ package login import ( "github.com/spf13/cobra" - "github.com/docker/api/aci" + "github.com/docker/compose-cli/aci" ) // AzureLoginCommand returns the azure login command diff --git a/cli/cmd/login/login.go b/cli/cmd/login/login.go index f9f78410a..90413ba70 100644 --- a/cli/cmd/login/login.go +++ b/cli/cmd/login/login.go @@ -21,14 +21,14 @@ import ( "fmt" "strings" - "github.com/docker/api/cli/cmd/mobyflags" + "github.com/docker/compose-cli/cli/cmd/mobyflags" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/cli/mobycli" - "github.com/docker/api/client" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/cli/mobycli" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/errdefs" ) // Command returns the login command diff --git a/cli/cmd/logout/azure.go b/cli/cmd/logout/azure.go index a976b800b..6f7ee0b96 100644 --- a/cli/cmd/logout/azure.go +++ b/cli/cmd/logout/azure.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/errdefs" ) // AzureLogoutCommand returns the azure logout command diff --git a/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go index bea8a8e53..1f235a77c 100644 --- a/cli/cmd/logout/logout.go +++ b/cli/cmd/logout/logout.go @@ -19,7 +19,7 @@ package logout import ( "github.com/spf13/cobra" - "github.com/docker/api/cli/mobycli" + "github.com/docker/compose-cli/cli/mobycli" ) // Command returns the login command diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go index 18107ff59..83e917b0c 100644 --- a/cli/cmd/logs.go +++ b/cli/cmd/logs.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/containers" ) type logsOpts struct { diff --git a/cli/cmd/ps.go b/cli/cmd/ps.go index c437cddd8..ddd2e325e 100644 --- a/cli/cmd/ps.go +++ b/cli/cmd/ps.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/cli/formatter" - "github.com/docker/api/client" - formatter2 "github.com/docker/api/formatter" + "github.com/docker/compose-cli/cli/formatter" + "github.com/docker/compose-cli/client" + formatter2 "github.com/docker/compose-cli/formatter" ) type psOpts struct { diff --git a/cli/cmd/ps_test.go b/cli/cmd/ps_test.go index 588f841b1..f303ad21a 100644 --- a/cli/cmd/ps_test.go +++ b/cli/cmd/ps_test.go @@ -22,8 +22,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/golden" - _ "github.com/docker/api/example" - "github.com/docker/api/tests/framework" + _ "github.com/docker/compose-cli/example" + "github.com/docker/compose-cli/tests/framework" ) func TestPs(t *testing.T) { diff --git a/cli/cmd/rm.go b/cli/cmd/rm.go index 8ee8def21..2ebfeeff5 100644 --- a/cli/cmd/rm.go +++ b/cli/cmd/rm.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/containers" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/errdefs" ) type rmOpts struct { diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go index 044459639..8a72c1a6d 100644 --- a/cli/cmd/run/run.go +++ b/cli/cmd/run/run.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/console" "github.com/spf13/cobra" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" - "github.com/docker/api/cli/options/run" - "github.com/docker/api/client" - "github.com/docker/api/progress" + "github.com/docker/compose-cli/cli/options/run" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/progress" ) // Command runs a container diff --git a/cli/cmd/secrets.go b/cli/cmd/secrets.go index 44978b791..2351729f7 100644 --- a/cli/cmd/secrets.go +++ b/cli/cmd/secrets.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/client" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/secrets" ) type createSecretOptions struct { diff --git a/cli/cmd/secrets_test.go b/cli/cmd/secrets_test.go index a443cc071..162b63677 100644 --- a/cli/cmd/secrets_test.go +++ b/cli/cmd/secrets_test.go @@ -22,7 +22,7 @@ import ( "gotest.tools/v3/golden" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/secrets" ) func TestPrintList(t *testing.T) { diff --git a/cli/cmd/serve.go b/cli/cmd/serve.go index ded061743..81f989724 100644 --- a/cli/cmd/serve.go +++ b/cli/cmd/serve.go @@ -23,11 +23,11 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - containersv1 "github.com/docker/api/protos/containers/v1" - contextsv1 "github.com/docker/api/protos/contexts/v1" - streamsv1 "github.com/docker/api/protos/streams/v1" - "github.com/docker/api/server" - "github.com/docker/api/server/proxy" + containersv1 "github.com/docker/compose-cli/protos/containers/v1" + contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" + "github.com/docker/compose-cli/server" + "github.com/docker/compose-cli/server/proxy" ) type serveOpts struct { diff --git a/cli/cmd/start.go b/cli/cmd/start.go index 87fdc7df4..cb27abf5f 100644 --- a/cli/cmd/start.go +++ b/cli/cmd/start.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/hashicorp/go-multierror" - "github.com/docker/api/client" + "github.com/docker/compose-cli/client" ) // StartCommand starts containers diff --git a/cli/cmd/stop.go b/cli/cmd/stop.go index 18fcfe602..e0003fd90 100644 --- a/cli/cmd/stop.go +++ b/cli/cmd/stop.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/hashicorp/go-multierror" - "github.com/docker/api/client" + "github.com/docker/compose-cli/client" ) type stopOpts struct { diff --git a/cli/cmd/version.go b/cli/cmd/version.go index d3cd088d3..370732209 100644 --- a/cli/cmd/version.go +++ b/cli/cmd/version.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "github.com/docker/api/cli/cmd/mobyflags" - "github.com/docker/api/cli/mobycli" + "github.com/docker/compose-cli/cli/cmd/mobyflags" + "github.com/docker/compose-cli/cli/mobycli" ) // VersionCommand command to display version diff --git a/cli/config/flags.go b/cli/config/flags.go index e77663c5e..31eb3187d 100644 --- a/cli/config/flags.go +++ b/cli/config/flags.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/pflag" - "github.com/docker/api/config" + "github.com/docker/compose-cli/config" ) // ConfigFlags are the global CLI flags diff --git a/cli/formatter/container.go b/cli/formatter/container.go index 83182be29..58734bfdb 100644 --- a/cli/formatter/container.go +++ b/cli/formatter/container.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) type portGroup struct { diff --git a/cli/formatter/container_test.go b/cli/formatter/container_test.go index baec7af23..0da9eaa39 100644 --- a/cli/formatter/container_test.go +++ b/cli/formatter/container_test.go @@ -21,7 +21,7 @@ import ( "gotest.tools/v3/assert" - "github.com/docker/api/cli/options/run" + "github.com/docker/compose-cli/cli/options/run" ) func TestDisplayPorts(t *testing.T) { diff --git a/cli/main.go b/cli/main.go index 26b2c2071..a95e776b1 100644 --- a/cli/main.go +++ b/cli/main.go @@ -27,31 +27,31 @@ import ( "syscall" "time" - "github.com/docker/api/cli/cmd/logout" + "github.com/docker/compose-cli/cli/cmd/logout" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" // Backend registrations - _ "github.com/docker/api/aci" - _ "github.com/docker/api/ecs" - _ "github.com/docker/api/example" - _ "github.com/docker/api/local" - "github.com/docker/api/metrics" + _ "github.com/docker/compose-cli/aci" + _ "github.com/docker/compose-cli/ecs" + _ "github.com/docker/compose-cli/example" + _ "github.com/docker/compose-cli/local" + "github.com/docker/compose-cli/metrics" - "github.com/docker/api/cli/cmd" - "github.com/docker/api/cli/cmd/compose" - contextcmd "github.com/docker/api/cli/cmd/context" - "github.com/docker/api/cli/cmd/login" - "github.com/docker/api/cli/cmd/run" - "github.com/docker/api/cli/mobycli" - cliopts "github.com/docker/api/cli/options" - "github.com/docker/api/config" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/cli/cmd" + "github.com/docker/compose-cli/cli/cmd/compose" + contextcmd "github.com/docker/compose-cli/cli/cmd/context" + "github.com/docker/compose-cli/cli/cmd/login" + "github.com/docker/compose-cli/cli/cmd/run" + "github.com/docker/compose-cli/cli/mobycli" + cliopts "github.com/docker/compose-cli/cli/options" + "github.com/docker/compose-cli/config" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" ) var ( diff --git a/cli/main_test.go b/cli/main_test.go index 736561126..2db34c012 100644 --- a/cli/main_test.go +++ b/cli/main_test.go @@ -24,11 +24,11 @@ import ( "gotest.tools/v3/assert" - "github.com/docker/api/cli/cmd" - "github.com/docker/api/cli/cmd/context" - "github.com/docker/api/cli/cmd/login" - "github.com/docker/api/cli/cmd/run" - "github.com/docker/api/config" + "github.com/docker/compose-cli/cli/cmd" + "github.com/docker/compose-cli/cli/cmd/context" + "github.com/docker/compose-cli/cli/cmd/login" + "github.com/docker/compose-cli/cli/cmd/run" + "github.com/docker/compose-cli/config" ) var contextSetConfig = []byte(`{ diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go index ace7c8aec..7b227159a 100644 --- a/cli/mobycli/exec.go +++ b/cli/mobycli/exec.go @@ -24,8 +24,8 @@ import ( "os/signal" "strings" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" ) var delegatedContextTypes = []string{store.DefaultContextType, store.AwsContextType} diff --git a/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go index 8c1f18c20..5bfb533e6 100644 --- a/cli/mobycli/exec_test.go +++ b/cli/mobycli/exec_test.go @@ -21,7 +21,7 @@ import ( "gotest.tools/v3/assert" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/context/store" ) func TestDelegateContextTypeToMoby(t *testing.T) { diff --git a/cli/options/options.go b/cli/options/options.go index 07879ec7d..13a2b461b 100644 --- a/cli/options/options.go +++ b/cli/options/options.go @@ -17,8 +17,8 @@ package options import ( - cliconfig "github.com/docker/api/cli/config" - apicontext "github.com/docker/api/context" + cliconfig "github.com/docker/compose-cli/cli/config" + apicontext "github.com/docker/compose-cli/context" ) // GlobalOpts contains the global CLI options diff --git a/cli/options/run/opts.go b/cli/options/run/opts.go index 8e1792ce1..bc7e3e05b 100644 --- a/cli/options/run/opts.go +++ b/cli/options/run/opts.go @@ -21,13 +21,13 @@ import ( "strconv" "strings" - "github.com/docker/api/utils" + "github.com/docker/compose-cli/utils" "github.com/docker/docker/pkg/namesgenerator" "github.com/docker/go-connections/nat" - "github.com/docker/api/containers" - "github.com/docker/api/formatter" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/formatter" ) // Opts contain run command options diff --git a/cli/options/run/opts_test.go b/cli/options/run/opts_test.go index f668b77fa..58a4bf03d 100644 --- a/cli/options/run/opts_test.go +++ b/cli/options/run/opts_test.go @@ -25,7 +25,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) var ( diff --git a/client/client.go b/client/client.go index 3b864a0b6..4b956a464 100644 --- a/client/client.go +++ b/client/client.go @@ -19,13 +19,13 @@ package client import ( "context" - "github.com/docker/api/backend" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/cloud" - "github.com/docker/api/context/store" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/backend" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/secrets" ) // New returns a backend client associated with current context diff --git a/client/compose.go b/client/compose.go index ba78d1a84..ff7892dff 100644 --- a/client/compose.go +++ b/client/compose.go @@ -22,8 +22,8 @@ import ( "github.com/compose-spec/compose-go/cli" - "github.com/docker/api/compose" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/errdefs" ) type composeService struct { diff --git a/client/containers.go b/client/containers.go index b958c7afe..bef786a01 100644 --- a/client/containers.go +++ b/client/containers.go @@ -19,8 +19,8 @@ package client import ( "context" - "github.com/docker/api/containers" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/errdefs" ) type containerService struct { diff --git a/client/secrets.go b/client/secrets.go index 44385f863..254318f3e 100644 --- a/client/secrets.go +++ b/client/secrets.go @@ -19,8 +19,8 @@ package client import ( "context" - "github.com/docker/api/errdefs" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/secrets" ) type secretsService struct { diff --git a/config/config.go b/config/config.go index a22e8150d..0241348fb 100644 --- a/config/config.go +++ b/config/config.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/context/store" ) type dirKey struct{} diff --git a/containers/api.go b/containers/api.go index b1eb0c8ac..b4deb984d 100644 --- a/containers/api.go +++ b/containers/api.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/docker/api/formatter" + "github.com/docker/compose-cli/formatter" ) const ( diff --git a/context/cloud/api.go b/context/cloud/api.go index 84c2c242f..5dc8b0e38 100644 --- a/context/cloud/api.go +++ b/context/cloud/api.go @@ -19,7 +19,7 @@ package cloud import ( "context" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) // Service cloud specific services diff --git a/context/store/store.go b/context/store/store.go index 15ce3ef0c..9bbc9aa84 100644 --- a/context/store/store.go +++ b/context/store/store.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/go-digest" "github.com/pkg/errors" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) const ( diff --git a/context/store/store_test.go b/context/store/store_test.go index 2401f422a..37a29e588 100644 --- a/context/store/store_test.go +++ b/context/store/store_test.go @@ -25,7 +25,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/errdefs" ) func testStore(t *testing.T) Store { diff --git a/ecs/backend.go b/ecs/backend.go index 107902f32..5bd391ff6 100644 --- a/ecs/backend.go +++ b/ecs/backend.go @@ -22,15 +22,15 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/secrets" - "github.com/docker/api/backend" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/cloud" - "github.com/docker/api/context/store" - "github.com/docker/api/errdefs" + "github.com/docker/compose-cli/backend" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/errdefs" ) const backendType = store.EcsContextType diff --git a/ecs/cloudformation.go b/ecs/cloudformation.go index 9481a3503..4eb67c2b7 100644 --- a/ecs/cloudformation.go +++ b/ecs/cloudformation.go @@ -25,7 +25,7 @@ import ( "github.com/compose-spec/compose-go/cli" - "github.com/docker/api/compose" + "github.com/docker/compose-cli/compose" ecsapi "github.com/aws/aws-sdk-go/service/ecs" "github.com/aws/aws-sdk-go/service/elbv2" diff --git a/ecs/cloudformation_test.go b/ecs/cloudformation_test.go index 029591207..f12ff4a48 100644 --- a/ecs/cloudformation_test.go +++ b/ecs/cloudformation_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/docker/api/compose" + "github.com/docker/compose-cli/compose" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/awslabs/goformation/v4/cloudformation" diff --git a/ecs/context.go b/ecs/context.go index 65f59e818..13e39014b 100644 --- a/ecs/context.go +++ b/ecs/context.go @@ -29,8 +29,8 @@ import ( "github.com/aws/aws-sdk-go/aws/defaults" "gopkg.in/ini.v1" - "github.com/docker/api/context/store" - "github.com/docker/api/prompt" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/prompt" ) type contextCreateAWSHelper struct { diff --git a/ecs/convert.go b/ecs/convert.go index 0f1f503bf..0ac6bca97 100644 --- a/ecs/convert.go +++ b/ecs/convert.go @@ -34,7 +34,7 @@ import ( "github.com/docker/cli/opts" "github.com/joho/godotenv" - "github.com/docker/api/ecs/secrets" + "github.com/docker/compose-cli/ecs/secrets" ) const secretsInitContainerImage = "docker/ecs-secrets-sidecar" diff --git a/ecs/list.go b/ecs/list.go index 3c9ea5adf..8927bb85e 100644 --- a/ecs/list.go +++ b/ecs/list.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/docker/api/compose" + "github.com/docker/compose-cli/compose" "github.com/compose-spec/compose-go/cli" ) diff --git a/ecs/sdk.go b/ecs/sdk.go index eb33d67ae..19ffbe251 100644 --- a/ecs/sdk.go +++ b/ecs/sdk.go @@ -24,8 +24,8 @@ import ( "github.com/aws/aws-sdk-go/aws/client" - "github.com/docker/api/compose" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/secrets" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudformation" diff --git a/ecs/secrets.go b/ecs/secrets.go index 60c8964f1..03c8b8e74 100644 --- a/ecs/secrets.go +++ b/ecs/secrets.go @@ -19,7 +19,7 @@ package ecs import ( "context" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/secrets" ) func (b *ecsAPIService) CreateSecret(ctx context.Context, secret secrets.Secret) (string, error) { diff --git a/ecs/secrets/main/main.go b/ecs/secrets/main/main.go index d4b23876a..733ad0545 100644 --- a/ecs/secrets/main/main.go +++ b/ecs/secrets/main/main.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/docker/api/ecs/secrets" + "github.com/docker/compose-cli/ecs/secrets" ) const secretsFolder = "/run/secrets" diff --git a/ecs/wait.go b/ecs/wait.go index a6933ddec..9346ae4f5 100644 --- a/ecs/wait.go +++ b/ecs/wait.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/docker/api/progress" + "github.com/docker/compose-cli/progress" "github.com/aws/aws-sdk-go/aws" ) diff --git a/example/backend.go b/example/backend.go index 16a99d0ee..9fda709de 100644 --- a/example/backend.go +++ b/example/backend.go @@ -26,12 +26,12 @@ import ( "github.com/compose-spec/compose-go/cli" - "github.com/docker/api/backend" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - "github.com/docker/api/context/cloud" - "github.com/docker/api/errdefs" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/backend" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/secrets" ) type apiService struct { diff --git a/go.mod b/go.mod index c8b466526..c1138e0d0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/docker/api +module github.com/docker/compose-cli go 1.15 diff --git a/import-restrictions.yaml b/import-restrictions.yaml index d71febe23..7b3445576 100644 --- a/import-restrictions.yaml +++ b/import-restrictions.yaml @@ -1,33 +1,33 @@ # Backends shouldn't depend on other backends or the cli - path: ./aci forbiddenImports: - - github.com/docker/api/cli - - github.com/docker/api/ecs - - github.com/docker/api/example - - github.com/docker/api/local - - github.com/docker/api/metrics - - github.com/docker/api/server + - github.com/docker/compose-cli/cli + - github.com/docker/compose-cli/ecs + - github.com/docker/compose-cli/example + - github.com/docker/compose-cli/local + - github.com/docker/compose-cli/metrics + - github.com/docker/compose-cli/server - path: ./ecs forbiddenImports: - - github.com/docker/api/aci - - github.com/docker/api/cli - - github.com/docker/api/example - - github.com/docker/api/local - - github.com/docker/api/metrics - - github.com/docker/api/server + - github.com/docker/compose-cli/aci + - github.com/docker/compose-cli/cli + - github.com/docker/compose-cli/example + - github.com/docker/compose-cli/local + - github.com/docker/compose-cli/metrics + - github.com/docker/compose-cli/server - path: ./example forbiddenImports: - - github.com/docker/api/aci - - github.com/docker/api/cli - - github.com/docker/api/ecs - - github.com/docker/api/local - - github.com/docker/api/metrics - - github.com/docker/api/server + - github.com/docker/compose-cli/aci + - github.com/docker/compose-cli/cli + - github.com/docker/compose-cli/ecs + - github.com/docker/compose-cli/local + - github.com/docker/compose-cli/metrics + - github.com/docker/compose-cli/server - path: ./local forbiddenImports: - - github.com/docker/api/aci - - github.com/docker/api/cli - - github.com/docker/api/ecs - - github.com/docker/api/example - - github.com/docker/api/metrics - - github.com/docker/api/server + - github.com/docker/compose-cli/aci + - github.com/docker/compose-cli/cli + - github.com/docker/compose-cli/ecs + - github.com/docker/compose-cli/example + - github.com/docker/compose-cli/metrics + - github.com/docker/compose-cli/server diff --git a/local/backend.go b/local/backend.go index 30a901fdd..7a716b75c 100644 --- a/local/backend.go +++ b/local/backend.go @@ -36,12 +36,12 @@ import ( "github.com/docker/docker/pkg/stdcopy" "github.com/pkg/errors" - "github.com/docker/api/backend" - "github.com/docker/api/compose" - "github.com/docker/api/containers" - "github.com/docker/api/context/cloud" - "github.com/docker/api/errdefs" - "github.com/docker/api/secrets" + "github.com/docker/compose-cli/backend" + "github.com/docker/compose-cli/compose" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/cloud" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/secrets" ) type local struct { diff --git a/local/e2e/backend_test.go b/local/e2e/backend_test.go index a1cdc4de7..16a76507f 100644 --- a/local/e2e/backend_test.go +++ b/local/e2e/backend_test.go @@ -24,7 +24,7 @@ import ( "gotest.tools/v3/icmd" - . "github.com/docker/api/tests/framework" + . "github.com/docker/compose-cli/tests/framework" ) var binDir string diff --git a/metrics/metrics.go b/metrics/metrics.go index eae08576e..2389541fd 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -21,7 +21,7 @@ import ( flag "github.com/spf13/pflag" - "github.com/docker/api/utils" + "github.com/docker/compose-cli/utils" ) var managementCommands = []string{ diff --git a/progress/tty.go b/progress/tty.go index b71a36d66..4dd9dee51 100644 --- a/progress/tty.go +++ b/progress/tty.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/docker/api/utils" + "github.com/docker/compose-cli/utils" "github.com/buger/goterm" "github.com/morikuni/aec" diff --git a/protos/compose/v1/compose.pb.go b/protos/compose/v1/compose.pb.go index 6462e18d0..4bd488c83 100644 --- a/protos/compose/v1/compose.pb.go +++ b/protos/compose/v1/compose.pb.go @@ -253,11 +253,11 @@ var file_protos_compose_v1_compose_proto_rawDesc = []byte{ 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x44, - 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x2c, 0x5a, 0x2a, 0x67, + 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x70, - 0x6f, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protos/compose/v1/compose.proto b/protos/compose/v1/compose.proto index 1088cbc30..5f7c5cf23 100644 --- a/protos/compose/v1/compose.proto +++ b/protos/compose/v1/compose.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package com.docker.api.protos.compose.v1; -option go_package = "github.com/docker/api/protos/compose/v1;v1"; +option go_package = "github.com/docker/compose-cli/protos/compose/v1;v1"; service Compose { rpc Up(ComposeUpRequest) returns (ComposeUpResponse); diff --git a/protos/containers/v1/containers.pb.go b/protos/containers/v1/containers.pb.go index 275285394..eec2ec32d 100644 --- a/protos/containers/v1/containers.pb.go +++ b/protos/containers/v1/containers.pb.go @@ -1277,10 +1277,11 @@ var file_protos_containers_v1_containers_proto_rawDesc = []byte{ 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, 0x3b, - 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d, 0x63, + 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/protos/containers/v1/containers.proto b/protos/containers/v1/containers.proto index 921af367a..a957d67b8 100644 --- a/protos/containers/v1/containers.proto +++ b/protos/containers/v1/containers.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package com.docker.api.protos.containers.v1; -option go_package = "github.com/docker/api/protos/containers/v1;v1"; +option go_package = "github.com/docker/compose-cli/protos/containers/v1;v1"; service Containers { rpc List(ListRequest) returns (ListResponse); diff --git a/protos/contexts/v1/contexts.pb.go b/protos/contexts/v1/contexts.pb.go index 72aec8632..ec8845718 100644 --- a/protos/contexts/v1/contexts.pb.go +++ b/protos/contexts/v1/contexts.pb.go @@ -315,10 +315,10 @@ var file_protos_contexts_v1_contexts_proto_rawDesc = []byte{ 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d, + 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protos/contexts/v1/contexts.proto b/protos/contexts/v1/contexts.proto index 027c95f0a..c18d828d7 100644 --- a/protos/contexts/v1/contexts.proto +++ b/protos/contexts/v1/contexts.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package com.docker.api.protos.context.v1; -option go_package = "github.com/docker/api/protos/context/v1;v1"; +option go_package = "github.com/docker/compose-cli/protos/context/v1;v1"; service Contexts { // Sets the current request for all calls diff --git a/protos/streams/v1/streams.pb.go b/protos/streams/v1/streams.pb.go index 7fc8046bc..2097e20a8 100644 --- a/protos/streams/v1/streams.pb.go +++ b/protos/streams/v1/streams.pb.go @@ -280,10 +280,11 @@ var file_protos_streams_v1_streams_proto_rawDesc = []byte{ 0x65, 0x61, 0x6d, 0x12, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x1a, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x28, - 0x01, 0x30, 0x01, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, + 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, + 0x61, 0x6d, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/protos/streams/v1/streams.proto b/protos/streams/v1/streams.proto index 70fdce288..64ab8dbb9 100644 --- a/protos/streams/v1/streams.proto +++ b/protos/streams/v1/streams.proto @@ -19,7 +19,7 @@ package com.docker.api.protos.streams.v1; import "google/protobuf/any.proto"; -option go_package = "github.com/docker/api/protos/streams/v1;v1"; +option go_package = "github.com/docker/compose-cli/protos/streams/v1;v1"; service Streaming { rpc NewStream(stream google.protobuf.Any) returns (stream google.protobuf.Any); diff --git a/server/interceptor.go b/server/interceptor.go index 46df4c3d1..ea3f3f8d1 100644 --- a/server/interceptor.go +++ b/server/interceptor.go @@ -24,11 +24,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/docker/api/client" - "github.com/docker/api/config" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" - "github.com/docker/api/server/proxy" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/config" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/server/proxy" ) // key is the key where the current docker context is stored in the metadata diff --git a/server/interceptor_test.go b/server/interceptor_test.go index f93a2eb1b..099b0dc5e 100644 --- a/server/interceptor_test.go +++ b/server/interceptor_test.go @@ -28,8 +28,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/docker/api/config" - apicontext "github.com/docker/api/context" + "github.com/docker/compose-cli/config" + apicontext "github.com/docker/compose-cli/context" ) func testContext(t *testing.T) context.Context { diff --git a/server/proxy/containers.go b/server/proxy/containers.go index 1be19fe31..7850f038b 100644 --- a/server/proxy/containers.go +++ b/server/proxy/containers.go @@ -20,10 +20,10 @@ import ( "context" "errors" - "github.com/docker/api/containers" - "github.com/docker/api/formatter" - containersv1 "github.com/docker/api/protos/containers/v1" - "github.com/docker/api/server/proxy/streams" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/formatter" + containersv1 "github.com/docker/compose-cli/protos/containers/v1" + "github.com/docker/compose-cli/server/proxy/streams" ) func portsToGrpc(ports []containers.Port) []*containersv1.Port { diff --git a/server/proxy/containers_test.go b/server/proxy/containers_test.go index 93fe228a2..269be7231 100644 --- a/server/proxy/containers_test.go +++ b/server/proxy/containers_test.go @@ -21,9 +21,9 @@ import ( "gotest.tools/v3/assert" - "github.com/docker/api/containers" - "github.com/docker/api/formatter" - containersv1 "github.com/docker/api/protos/containers/v1" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/formatter" + containersv1 "github.com/docker/compose-cli/protos/containers/v1" ) func TestGrpcContainerToContainerConfig(t *testing.T) { diff --git a/server/proxy/contexts.go b/server/proxy/contexts.go index 8c4ee93bb..60bace74a 100644 --- a/server/proxy/contexts.go +++ b/server/proxy/contexts.go @@ -19,9 +19,9 @@ package proxy import ( "context" - "github.com/docker/api/config" - "github.com/docker/api/context/store" - contextsv1 "github.com/docker/api/protos/contexts/v1" + "github.com/docker/compose-cli/config" + "github.com/docker/compose-cli/context/store" + contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" ) type contextsProxy struct { diff --git a/server/proxy/proxy.go b/server/proxy/proxy.go index 51e8d4c34..cac286739 100644 --- a/server/proxy/proxy.go +++ b/server/proxy/proxy.go @@ -20,12 +20,12 @@ import ( "context" "sync" - "github.com/docker/api/client" - "github.com/docker/api/config" - containersv1 "github.com/docker/api/protos/containers/v1" - contextsv1 "github.com/docker/api/protos/contexts/v1" - streamsv1 "github.com/docker/api/protos/streams/v1" - "github.com/docker/api/server/proxy/streams" + "github.com/docker/compose-cli/client" + "github.com/docker/compose-cli/config" + containersv1 "github.com/docker/compose-cli/protos/containers/v1" + contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" + "github.com/docker/compose-cli/server/proxy/streams" ) type clientKey struct{} diff --git a/server/proxy/streams.go b/server/proxy/streams.go index fd2bff81c..eccdb388f 100644 --- a/server/proxy/streams.go +++ b/server/proxy/streams.go @@ -21,8 +21,8 @@ import ( "github.com/sirupsen/logrus" "google.golang.org/grpc/metadata" - streamsv1 "github.com/docker/api/protos/streams/v1" - "github.com/docker/api/server/proxy/streams" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" + "github.com/docker/compose-cli/server/proxy/streams" ) func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error { diff --git a/server/proxy/streams/io.go b/server/proxy/streams/io.go index 3cdd414b5..d9adc8a07 100644 --- a/server/proxy/streams/io.go +++ b/server/proxy/streams/io.go @@ -19,7 +19,7 @@ package streams import ( "github.com/golang/protobuf/ptypes" - streamsv1 "github.com/docker/api/protos/streams/v1" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" ) // IO implements an io.ReadWriter that forwards everything to the stream diff --git a/server/proxy/streams/logs.go b/server/proxy/streams/logs.go index c61a1c983..84cc7f510 100644 --- a/server/proxy/streams/logs.go +++ b/server/proxy/streams/logs.go @@ -21,7 +21,7 @@ import ( "google.golang.org/grpc" - containersv1 "github.com/docker/api/protos/containers/v1" + containersv1 "github.com/docker/compose-cli/protos/containers/v1" ) // Log implements an io.Writer that proxies logs over a gRPC stream diff --git a/server/proxy/streams/logs_test.go b/server/proxy/streams/logs_test.go index 8b1d21903..bd91f858a 100644 --- a/server/proxy/streams/logs_test.go +++ b/server/proxy/streams/logs_test.go @@ -24,7 +24,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - v1 "github.com/docker/api/protos/containers/v1" + v1 "github.com/docker/compose-cli/protos/containers/v1" ) type logServer struct { diff --git a/server/proxy/streams/stream.go b/server/proxy/streams/stream.go index f3bf4ed2f..f0eb0a930 100644 --- a/server/proxy/streams/stream.go +++ b/server/proxy/streams/stream.go @@ -19,7 +19,7 @@ package streams import ( "sync" - streamsv1 "github.com/docker/api/protos/streams/v1" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" ) // Stream is a bidirectional stream for container IO diff --git a/server/proxy/streams/stream_test.go b/server/proxy/streams/stream_test.go index 9bed1eaa2..15055af86 100644 --- a/server/proxy/streams/stream_test.go +++ b/server/proxy/streams/stream_test.go @@ -29,7 +29,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - streamsv1 "github.com/docker/api/protos/streams/v1" + streamsv1 "github.com/docker/compose-cli/protos/streams/v1" ) type byteStream struct { diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index 395063b9c..ddf34c444 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -41,13 +41,13 @@ import ( "github.com/Azure/azure-storage-file-go/azfile" "github.com/Azure/go-autorest/autorest/to" - "github.com/docker/api/aci" - "github.com/docker/api/aci/login" - "github.com/docker/api/containers" - "github.com/docker/api/context/store" - "github.com/docker/api/errdefs" - "github.com/docker/api/tests/aci-e2e/storage" - . "github.com/docker/api/tests/framework" + "github.com/docker/compose-cli/aci" + "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/containers" + "github.com/docker/compose-cli/context/store" + "github.com/docker/compose-cli/errdefs" + "github.com/docker/compose-cli/tests/aci-e2e/storage" + . "github.com/docker/compose-cli/tests/framework" ) const ( diff --git a/tests/aci-e2e/storage/storage.go b/tests/aci-e2e/storage/storage.go index bf5b803c9..77eff6f04 100644 --- a/tests/aci-e2e/storage/storage.go +++ b/tests/aci-e2e/storage/storage.go @@ -24,8 +24,8 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" - "github.com/docker/api/aci/login" - "github.com/docker/api/context/store" + "github.com/docker/compose-cli/aci/login" + "github.com/docker/compose-cli/context/store" ) // CreateStorageAccount creates a new storage account. diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 0eccc3456..436255fc5 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -30,7 +30,7 @@ import ( "gotest.tools/v3/golden" "gotest.tools/v3/icmd" - . "github.com/docker/api/tests/framework" + . "github.com/docker/compose-cli/tests/framework" ) var binDir string diff --git a/tests/ecs-e2e/e2e-ecs_test.go b/tests/ecs-e2e/e2e-ecs_test.go index 4d3e6ab85..51e323c96 100644 --- a/tests/ecs-e2e/e2e-ecs_test.go +++ b/tests/ecs-e2e/e2e-ecs_test.go @@ -27,11 +27,10 @@ import ( "time" "gotest.tools/v3/assert" + "gotest.tools/v3/icmd" "gotest.tools/v3/poll" - "gotest.tools/v3/icmd" - - . "github.com/docker/api/tests/framework" + . "github.com/docker/compose-cli/tests/framework" ) var binDir string diff --git a/tests/framework/e2e.go b/tests/framework/e2e.go index a5d4a50f3..5b5561d77 100644 --- a/tests/framework/e2e.go +++ b/tests/framework/e2e.go @@ -31,7 +31,7 @@ import ( is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/icmd" - "github.com/docker/api/containers" + "github.com/docker/compose-cli/containers" ) var ( diff --git a/tests/framework/unit.go b/tests/framework/unit.go index 45780fb08..76b0df771 100644 --- a/tests/framework/unit.go +++ b/tests/framework/unit.go @@ -25,8 +25,8 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - apicontext "github.com/docker/api/context" - "github.com/docker/api/context/store" + apicontext "github.com/docker/compose-cli/context" + "github.com/docker/compose-cli/context/store" ) // TestCLI is a helper struct for CLI tests. diff --git a/tests/skip-win-ci-e2e/skip_win_ci_test.go b/tests/skip-win-ci-e2e/skip_win_ci_test.go index 8cea7d754..d9f4397b1 100644 --- a/tests/skip-win-ci-e2e/skip_win_ci_test.go +++ b/tests/skip-win-ci-e2e/skip_win_ci_test.go @@ -31,7 +31,7 @@ import ( "gotest.tools/v3/icmd" "gotest.tools/v3/poll" - . "github.com/docker/api/tests/framework" + . "github.com/docker/compose-cli/tests/framework" ) var binDir string