Rename docker/api -> docker/compose-cli

Signed-off-by: Chris Crone <christopher.crone@docker.com>
This commit is contained in:
Chris Crone 2020-08-21 17:24:53 +02:00
parent d6c8039562
commit 4c6280b0e9
116 changed files with 299 additions and 298 deletions

View File

@ -20,7 +20,7 @@ Release headlines
### Known issues ### Known issues
* *
[Release diff](https://github.com/docker/api/compare/<LAST TAG>...<THIS TAG>) [Release diff](https://github.com/docker/compose-cli/compare/<LAST TAG>...<THIS TAG>)
--> -->
## 0.1.4 - 2020-06-26 ## 0.1.4 - 2020-06-26
@ -34,7 +34,7 @@ This release includes:
* A gRPC API for managing contexts and Azure containers * A gRPC API for managing contexts and Azure containers
### Known issues ### 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. * 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 <CONTAINER_ID>`. * `docker run` detaches from the container by default, even if `-d` is not specified. Logs can be seen later on with command `docker log <CONTAINER_ID>`.
* Replicas are not supported when deploying Compose application. One container will be run for each Compose service. Several services cannot expose the same port. * Replicas are not supported when deploying Compose application. One container will be run for each Compose service. Several services cannot expose the same port.

View File

@ -18,7 +18,7 @@ ARG GO_VERSION=1.15.0-alpine
ARG GOLANGCI_LINT_VERSION=v1.30.0-alpine ARG GOLANGCI_LINT_VERSION=v1.30.0-alpine
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
WORKDIR /api WORKDIR /compose-cli
ENV GO111MODULE=on ENV GO111MODULE=on
RUN apk add --no-cache \ RUN apk add --no-cache \
git \ git \
@ -77,7 +77,7 @@ RUN --mount=target=. \
make BINARY=/out/docker -f builder.Makefile cross make BINARY=/out/docker -f builder.Makefile cross
FROM scratch AS protos FROM scratch AS protos
COPY --from=make-protos /api/protos . COPY --from=make-protos /compose-cli/protos .
FROM scratch AS cli FROM scratch AS cli
COPY --from=make-cli /out/* . COPY --from=make-cli /out/* .
@ -96,7 +96,7 @@ RUN --mount=target=. \
make -f builder.Makefile test make -f builder.Makefile test
FROM base as check-license-headers 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=. \ RUN --mount=target=. \
--mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/root/.cache/go-build \
make -f builder.Makefile check-license-headers make -f builder.Makefile check-license-headers

View File

@ -1,6 +1,6 @@
# Docker API # 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 ## Dev Setup
@ -48,7 +48,7 @@ make e2e-local
``` ```
This requires a local Docker Engine running 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 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 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 TEST_AWS_PROFILE=myProfile TEST_AWS_REGION=eu-west-3 make e2e-ecs
``` ```

View File

@ -33,12 +33,12 @@ import (
"github.com/morikuni/aec" "github.com/morikuni/aec"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/aci/convert" "github.com/docker/compose-cli/aci/convert"
"github.com/docker/api/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/progress" "github.com/docker/compose-cli/progress"
) )
func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error { func createACIContainers(ctx context.Context, aciContext store.AciContext, groupDefinition containerinstance.ContainerGroup) error {

View File

@ -32,16 +32,16 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/docker/api/aci/convert" "github.com/docker/compose-cli/aci/convert"
"github.com/docker/api/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/api/backend" "github.com/docker/compose-cli/backend"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
const ( const (

View File

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
func TestGetContainerName(t *testing.T) { func TestGetContainerName(t *testing.T) {

View File

@ -27,8 +27,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/prompt" "github.com/docker/compose-cli/prompt"
) )
type contextCreateACIHelper struct { type contextCreateACIHelper struct {

View File

@ -28,7 +28,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
type contextMocks struct { type contextMocks struct {

View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/types" "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 // ContainerToComposeProject convert container config to compose project

View File

@ -23,7 +23,7 @@ import (
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
func TestConvertContainerEnvironment(t *testing.T) { func TestConvertContainerEnvironment(t *testing.T) {

View File

@ -31,9 +31,9 @@ import (
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/aci/login" "github.com/docker/compose-cli/aci/login"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
const ( const (

View File

@ -27,8 +27,8 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp" is "gotest.tools/v3/assert/cmp"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
var convertCtx = store.AciContext{ var convertCtx = store.AciContext{

View File

@ -21,7 +21,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance" "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 // ToPorts converts Azure container ports to api ports

View File

@ -23,7 +23,7 @@ import (
"github.com/Azure/go-autorest/autorest/to" "github.com/Azure/go-autorest/autorest/to"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
func TestPortConvert(t *testing.T) { func TestPortConvert(t *testing.T) {

View File

@ -36,7 +36,7 @@ import (
"github.com/docker/cli/cli/config/types" "github.com/docker/cli/cli/config/types"
"github.com/pkg/errors" "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 // Specific username from ACR docs : https://github.com/Azure/acr/blob/master/docs/AAD-OAuth.md#getting-credentials-programatically

View File

@ -24,7 +24,7 @@ import (
"github.com/compose-spec/compose-go/types" "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 // GetRunVolumes return volume configurations for a project and a single service

View File

@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
const userAgent = "docker-cli" const userAgent = "docker-cli"

View File

@ -33,7 +33,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/oauth2" "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 //go login process, derived from code sample provided by MS at https://github.com/devigned/go-az-cli-stuff

View File

@ -22,7 +22,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
// StorageAccountHelper helper for Azure Storage Account // StorageAccountHelper helper for Azure Storage Account

View File

@ -23,7 +23,7 @@ import (
"github.com/Azure/azure-sdk-for-go/profiles/preview/preview/subscription/mgmt/subscription" "github.com/Azure/azure-sdk-for-go/profiles/preview/preview/subscription/mgmt/subscription"
"github.com/pkg/errors" "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 // ResourceGroupHelper interface to manage resource groups and subscription IDs

View File

@ -23,11 +23,11 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
var ( var (

View File

@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
type composeOptions struct { type composeOptions struct {

View File

@ -23,7 +23,7 @@ import (
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
) )
func convertCommand() *cobra.Command { func convertCommand() *cobra.Command {

View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/progress" "github.com/docker/compose-cli/progress"
) )
func downCommand() *cobra.Command { func downCommand() *cobra.Command {

View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
) )
func logsCommand() *cobra.Command { func logsCommand() *cobra.Command {

View File

@ -26,7 +26,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
) )
func psCommand() *cobra.Command { func psCommand() *cobra.Command {

View File

@ -21,8 +21,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/progress" "github.com/docker/compose-cli/progress"
) )
func upCommand() *cobra.Command { func upCommand() *cobra.Command {

View File

@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
type descriptionCreateOpts struct { type descriptionCreateOpts struct {

View File

@ -22,10 +22,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/aci" "github.com/docker/compose-cli/aci"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
func init() { func init() {

View File

@ -22,10 +22,10 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/ecs" "github.com/docker/compose-cli/ecs"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
func init() { func init() {

View File

@ -17,7 +17,7 @@
package context package context
import ( import (
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -26,10 +26,10 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/formatter" "github.com/docker/compose-cli/formatter"
) )
type lsOpts struct { type lsOpts struct {

View File

@ -25,8 +25,8 @@ import (
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/spf13/cobra" "github.com/spf13/cobra"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
type removeOpts struct { type removeOpts struct {

View File

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
func showCommand() *cobra.Command { func showCommand() *cobra.Command {

View File

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
func useCommand() *cobra.Command { func useCommand() *cobra.Command {

View File

@ -26,8 +26,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
type execOpts struct { type execOpts struct {

View File

@ -23,8 +23,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/formatter" "github.com/docker/compose-cli/formatter"
) )
// InspectCommand inspects into containers // InspectCommand inspects into containers

View File

@ -22,8 +22,8 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
_ "github.com/docker/api/example" _ "github.com/docker/compose-cli/example"
"github.com/docker/api/tests/framework" "github.com/docker/compose-cli/tests/framework"
) )
func TestInspectId(t *testing.T) { func TestInspectId(t *testing.T) {

View File

@ -19,7 +19,7 @@ package login
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/aci" "github.com/docker/compose-cli/aci"
) )
// AzureLoginCommand returns the azure login command // AzureLoginCommand returns the azure login command

View File

@ -21,14 +21,14 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/api/cli/cmd/mobyflags" "github.com/docker/compose-cli/cli/cmd/mobyflags"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
// Command returns the login command // Command returns the login command

View File

@ -23,8 +23,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
// AzureLogoutCommand returns the azure logout command // AzureLogoutCommand returns the azure logout command

View File

@ -19,7 +19,7 @@ package logout
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
) )
// Command returns the login command // Command returns the login command

View File

@ -25,8 +25,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
type logsOpts struct { type logsOpts struct {

View File

@ -25,9 +25,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/formatter" "github.com/docker/compose-cli/cli/formatter"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
formatter2 "github.com/docker/api/formatter" formatter2 "github.com/docker/compose-cli/formatter"
) )
type psOpts struct { type psOpts struct {

View File

@ -22,8 +22,8 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
_ "github.com/docker/api/example" _ "github.com/docker/compose-cli/example"
"github.com/docker/api/tests/framework" "github.com/docker/compose-cli/tests/framework"
) )
func TestPs(t *testing.T) { func TestPs(t *testing.T) {

View File

@ -25,9 +25,9 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
type rmOpts struct { type rmOpts struct {

View File

@ -25,11 +25,11 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/spf13/cobra" "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/compose-cli/cli/options/run"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/progress" "github.com/docker/compose-cli/progress"
) )
// Command runs a container // Command runs a container

View File

@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
type createSecretOptions struct { type createSecretOptions struct {

View File

@ -22,7 +22,7 @@ import (
"gotest.tools/v3/golden" "gotest.tools/v3/golden"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
func TestPrintList(t *testing.T) { func TestPrintList(t *testing.T) {

View File

@ -23,11 +23,11 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
containersv1 "github.com/docker/api/protos/containers/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1"
contextsv1 "github.com/docker/api/protos/contexts/v1" contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
streamsv1 "github.com/docker/api/protos/streams/v1" streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
"github.com/docker/api/server" "github.com/docker/compose-cli/server"
"github.com/docker/api/server/proxy" "github.com/docker/compose-cli/server/proxy"
) )
type serveOpts struct { type serveOpts struct {

View File

@ -20,14 +20,14 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
) )
// StartCommand starts containers // StartCommand starts containers

View File

@ -20,14 +20,14 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
) )
type stopOpts struct { type stopOpts struct {

View File

@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/api/cli/cmd/mobyflags" "github.com/docker/compose-cli/cli/cmd/mobyflags"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
) )
// VersionCommand command to display version // VersionCommand command to display version

View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
) )
// ConfigFlags are the global CLI flags // ConfigFlags are the global CLI flags

View File

@ -22,7 +22,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
type portGroup struct { type portGroup struct {

View File

@ -21,7 +21,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/cli/options/run" "github.com/docker/compose-cli/cli/options/run"
) )
func TestDisplayPorts(t *testing.T) { func TestDisplayPorts(t *testing.T) {

View File

@ -27,31 +27,31 @@ import (
"syscall" "syscall"
"time" "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/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
// Backend registrations // Backend registrations
_ "github.com/docker/api/aci" _ "github.com/docker/compose-cli/aci"
_ "github.com/docker/api/ecs" _ "github.com/docker/compose-cli/ecs"
_ "github.com/docker/api/example" _ "github.com/docker/compose-cli/example"
_ "github.com/docker/api/local" _ "github.com/docker/compose-cli/local"
"github.com/docker/api/metrics" "github.com/docker/compose-cli/metrics"
"github.com/docker/api/cli/cmd" "github.com/docker/compose-cli/cli/cmd"
"github.com/docker/api/cli/cmd/compose" "github.com/docker/compose-cli/cli/cmd/compose"
contextcmd "github.com/docker/api/cli/cmd/context" contextcmd "github.com/docker/compose-cli/cli/cmd/context"
"github.com/docker/api/cli/cmd/login" "github.com/docker/compose-cli/cli/cmd/login"
"github.com/docker/api/cli/cmd/run" "github.com/docker/compose-cli/cli/cmd/run"
"github.com/docker/api/cli/mobycli" "github.com/docker/compose-cli/cli/mobycli"
cliopts "github.com/docker/api/cli/options" cliopts "github.com/docker/compose-cli/cli/options"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
var ( var (

View File

@ -24,11 +24,11 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/cli/cmd" "github.com/docker/compose-cli/cli/cmd"
"github.com/docker/api/cli/cmd/context" "github.com/docker/compose-cli/cli/cmd/context"
"github.com/docker/api/cli/cmd/login" "github.com/docker/compose-cli/cli/cmd/login"
"github.com/docker/api/cli/cmd/run" "github.com/docker/compose-cli/cli/cmd/run"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
) )
var contextSetConfig = []byte(`{ var contextSetConfig = []byte(`{

View File

@ -24,8 +24,8 @@ import (
"os/signal" "os/signal"
"strings" "strings"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
var delegatedContextTypes = []string{store.DefaultContextType, store.AwsContextType} var delegatedContextTypes = []string{store.DefaultContextType, store.AwsContextType}

View File

@ -21,7 +21,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
func TestDelegateContextTypeToMoby(t *testing.T) { func TestDelegateContextTypeToMoby(t *testing.T) {

View File

@ -17,8 +17,8 @@
package options package options
import ( import (
cliconfig "github.com/docker/api/cli/config" cliconfig "github.com/docker/compose-cli/cli/config"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
) )
// GlobalOpts contains the global CLI options // GlobalOpts contains the global CLI options

View File

@ -21,13 +21,13 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/api/utils" "github.com/docker/compose-cli/utils"
"github.com/docker/docker/pkg/namesgenerator" "github.com/docker/docker/pkg/namesgenerator"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/formatter" "github.com/docker/compose-cli/formatter"
) )
// Opts contain run command options // Opts contain run command options

View File

@ -25,7 +25,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
) )
var ( var (

View File

@ -19,13 +19,13 @@ package client
import ( import (
"context" "context"
"github.com/docker/api/backend" "github.com/docker/compose-cli/backend"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
// New returns a backend client associated with current context // New returns a backend client associated with current context

View File

@ -22,8 +22,8 @@ import (
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
type composeService struct { type composeService struct {

View File

@ -19,8 +19,8 @@ package client
import ( import (
"context" "context"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
type containerService struct { type containerService struct {

View File

@ -19,8 +19,8 @@ package client
import ( import (
"context" "context"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
type secretsService struct { type secretsService struct {

View File

@ -25,7 +25,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
) )
type dirKey struct{} type dirKey struct{}

View File

@ -20,7 +20,7 @@ import (
"context" "context"
"io" "io"
"github.com/docker/api/formatter" "github.com/docker/compose-cli/formatter"
) )
const ( const (

View File

@ -19,7 +19,7 @@ package cloud
import ( import (
"context" "context"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
// Service cloud specific services // Service cloud specific services

View File

@ -28,7 +28,7 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
const ( const (

View File

@ -25,7 +25,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
func testStore(t *testing.T) Store { func testStore(t *testing.T) Store {

View File

@ -22,15 +22,15 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "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/compose-cli/backend"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
) )
const backendType = store.EcsContextType const backendType = store.EcsContextType

View File

@ -25,7 +25,7 @@ import (
"github.com/compose-spec/compose-go/cli" "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" ecsapi "github.com/aws/aws-sdk-go/service/ecs"
"github.com/aws/aws-sdk-go/service/elbv2" "github.com/aws/aws-sdk-go/service/elbv2"

View File

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/aws/aws-sdk-go/service/elbv2" "github.com/aws/aws-sdk-go/service/elbv2"
"github.com/awslabs/goformation/v4/cloudformation" "github.com/awslabs/goformation/v4/cloudformation"

View File

@ -29,8 +29,8 @@ import (
"github.com/aws/aws-sdk-go/aws/defaults" "github.com/aws/aws-sdk-go/aws/defaults"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/prompt" "github.com/docker/compose-cli/prompt"
) )
type contextCreateAWSHelper struct { type contextCreateAWSHelper struct {

View File

@ -34,7 +34,7 @@ import (
"github.com/docker/cli/opts" "github.com/docker/cli/opts"
"github.com/joho/godotenv" "github.com/joho/godotenv"
"github.com/docker/api/ecs/secrets" "github.com/docker/compose-cli/ecs/secrets"
) )
const secretsInitContainerImage = "docker/ecs-secrets-sidecar" const secretsInitContainerImage = "docker/ecs-secrets-sidecar"

View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
) )

View File

@ -24,8 +24,8 @@ import (
"github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/client"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation" "github.com/aws/aws-sdk-go/service/cloudformation"

View File

@ -19,7 +19,7 @@ package ecs
import ( import (
"context" "context"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
func (b *ecsAPIService) CreateSecret(ctx context.Context, secret secrets.Secret) (string, error) { func (b *ecsAPIService) CreateSecret(ctx context.Context, secret secrets.Secret) (string, error) {

View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/docker/api/ecs/secrets" "github.com/docker/compose-cli/ecs/secrets"
) )
const secretsFolder = "/run/secrets" const secretsFolder = "/run/secrets"

View File

@ -23,7 +23,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/api/progress" "github.com/docker/compose-cli/progress"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
) )

View File

@ -26,12 +26,12 @@ import (
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
"github.com/docker/api/backend" "github.com/docker/compose-cli/backend"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
type apiService struct { type apiService struct {

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/docker/api module github.com/docker/compose-cli
go 1.15 go 1.15

View File

@ -1,33 +1,33 @@
# Backends shouldn't depend on other backends or the cli # Backends shouldn't depend on other backends or the cli
- path: ./aci - path: ./aci
forbiddenImports: forbiddenImports:
- github.com/docker/api/cli - github.com/docker/compose-cli/cli
- github.com/docker/api/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/api/example - github.com/docker/compose-cli/example
- github.com/docker/api/local - github.com/docker/compose-cli/local
- github.com/docker/api/metrics - github.com/docker/compose-cli/metrics
- github.com/docker/api/server - github.com/docker/compose-cli/server
- path: ./ecs - path: ./ecs
forbiddenImports: forbiddenImports:
- github.com/docker/api/aci - github.com/docker/compose-cli/aci
- github.com/docker/api/cli - github.com/docker/compose-cli/cli
- github.com/docker/api/example - github.com/docker/compose-cli/example
- github.com/docker/api/local - github.com/docker/compose-cli/local
- github.com/docker/api/metrics - github.com/docker/compose-cli/metrics
- github.com/docker/api/server - github.com/docker/compose-cli/server
- path: ./example - path: ./example
forbiddenImports: forbiddenImports:
- github.com/docker/api/aci - github.com/docker/compose-cli/aci
- github.com/docker/api/cli - github.com/docker/compose-cli/cli
- github.com/docker/api/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/api/local - github.com/docker/compose-cli/local
- github.com/docker/api/metrics - github.com/docker/compose-cli/metrics
- github.com/docker/api/server - github.com/docker/compose-cli/server
- path: ./local - path: ./local
forbiddenImports: forbiddenImports:
- github.com/docker/api/aci - github.com/docker/compose-cli/aci
- github.com/docker/api/cli - github.com/docker/compose-cli/cli
- github.com/docker/api/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/api/example - github.com/docker/compose-cli/example
- github.com/docker/api/metrics - github.com/docker/compose-cli/metrics
- github.com/docker/api/server - github.com/docker/compose-cli/server

View File

@ -36,12 +36,12 @@ import (
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/backend" "github.com/docker/compose-cli/backend"
"github.com/docker/api/compose" "github.com/docker/compose-cli/compose"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/context/cloud" "github.com/docker/compose-cli/context/cloud"
"github.com/docker/api/errdefs" "github.com/docker/compose-cli/errdefs"
"github.com/docker/api/secrets" "github.com/docker/compose-cli/secrets"
) )
type local struct { type local struct {

View File

@ -24,7 +24,7 @@ import (
"gotest.tools/v3/icmd" "gotest.tools/v3/icmd"
. "github.com/docker/api/tests/framework" . "github.com/docker/compose-cli/tests/framework"
) )
var binDir string var binDir string

View File

@ -21,7 +21,7 @@ import (
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
"github.com/docker/api/utils" "github.com/docker/compose-cli/utils"
) )
var managementCommands = []string{ var managementCommands = []string{

View File

@ -25,7 +25,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/docker/api/utils" "github.com/docker/compose-cli/utils"
"github.com/buger/goterm" "github.com/buger/goterm"
"github.com/morikuni/aec" "github.com/morikuni/aec"

View File

@ -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, 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, 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, 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, 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, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f,
0x6f, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76,
0x33, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

View File

@ -17,7 +17,7 @@ syntax = "proto3";
package com.docker.api.protos.compose.v1; 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 { service Compose {
rpc Up(ComposeUpRequest) returns (ComposeUpResponse); rpc Up(ComposeUpRequest) returns (ComposeUpResponse);

View File

@ -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, 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, 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, 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, 0x65, 0x42, 0x37, 0x5a, 0x35, 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, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d, 0x63,
0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
} }
var ( var (

View File

@ -17,7 +17,7 @@ syntax = "proto3";
package com.docker.api.protos.containers.v1; 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 { service Containers {
rpc List(ListRequest) returns (ListResponse); rpc List(ListRequest) returns (ListResponse);

View File

@ -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, 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, 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, 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, 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, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65, 0x2d,
0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x78, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (

View File

@ -17,7 +17,7 @@ syntax = "proto3";
package com.docker.api.protos.context.v1; 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 { service Contexts {
// Sets the current request for all calls // Sets the current request for all calls

View File

@ -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, 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, 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, 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, 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, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x2f, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65,
0x74, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x2d, 0x63, 0x6c, 0x69, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65,
0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x61, 0x6d, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
} }
var ( var (

View File

@ -19,7 +19,7 @@ package com.docker.api.protos.streams.v1;
import "google/protobuf/any.proto"; 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 { service Streaming {
rpc NewStream(stream google.protobuf.Any) returns (stream google.protobuf.Any); rpc NewStream(stream google.protobuf.Any) returns (stream google.protobuf.Any);

View File

@ -24,11 +24,11 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"github.com/docker/api/client" "github.com/docker/compose-cli/client"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/api/context/store" "github.com/docker/compose-cli/context/store"
"github.com/docker/api/server/proxy" "github.com/docker/compose-cli/server/proxy"
) )
// key is the key where the current docker context is stored in the metadata // key is the key where the current docker context is stored in the metadata

View File

@ -28,8 +28,8 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp" "gotest.tools/v3/assert/cmp"
"github.com/docker/api/config" "github.com/docker/compose-cli/config"
apicontext "github.com/docker/api/context" apicontext "github.com/docker/compose-cli/context"
) )
func testContext(t *testing.T) context.Context { func testContext(t *testing.T) context.Context {

View File

@ -20,10 +20,10 @@ import (
"context" "context"
"errors" "errors"
"github.com/docker/api/containers" "github.com/docker/compose-cli/containers"
"github.com/docker/api/formatter" "github.com/docker/compose-cli/formatter"
containersv1 "github.com/docker/api/protos/containers/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1"
"github.com/docker/api/server/proxy/streams" "github.com/docker/compose-cli/server/proxy/streams"
) )
func portsToGrpc(ports []containers.Port) []*containersv1.Port { func portsToGrpc(ports []containers.Port) []*containersv1.Port {

Some files were not shown because too many files have changed in this diff Show More