mirror of https://github.com/docker/compose.git
Rename docker/api -> docker/compose-cli
Signed-off-by: Chris Crone <christopher.crone@docker.com>
This commit is contained in:
parent
d6c8039562
commit
4c6280b0e9
|
@ -20,7 +20,7 @@ Release headlines
|
|||
### 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
|
||||
|
@ -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 <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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Docker API
|
||||
|
||||
[](https://github.com/docker/api/actions)
|
||||
[](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
|
||||
```
|
||||
|
|
12
aci/aci.go
12
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 {
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -22,7 +22,7 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/docker/api/client"
|
||||
"github.com/docker/compose-cli/client"
|
||||
)
|
||||
|
||||
func logsCommand() *cobra.Command {
|
||||
|
|
|
@ -26,7 +26,7 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/docker/api/client"
|
||||
"github.com/docker/compose-cli/client"
|
||||
)
|
||||
|
||||
func psCommand() *cobra.Command {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
package context
|
||||
|
||||
import (
|
||||
"github.com/docker/api/cli/mobycli"
|
||||
"github.com/docker/compose-cli/cli/mobycli"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -22,7 +22,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/docker/api/containers"
|
||||
"github.com/docker/compose-cli/containers"
|
||||
)
|
||||
|
||||
type portGroup struct {
|
||||
|
|
|
@ -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) {
|
||||
|
|
34
cli/main.go
34
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 (
|
||||
|
|
|
@ -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(`{
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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{}
|
||||
|
|
|
@ -20,7 +20,7 @@ import (
|
|||
"context"
|
||||
"io"
|
||||
|
||||
"github.com/docker/api/formatter"
|
||||
"github.com/docker/compose-cli/formatter"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -19,7 +19,7 @@ package cloud
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/docker/api/errdefs"
|
||||
"github.com/docker/compose-cli/errdefs"
|
||||
)
|
||||
|
||||
// Service cloud specific services
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/docker/api/ecs/secrets"
|
||||
"github.com/docker/compose-cli/ecs/secrets"
|
||||
)
|
||||
|
||||
const secretsFolder = "/run/secrets"
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
2
go.mod
2
go.mod
|
@ -1,4 +1,4 @@
|
|||
module github.com/docker/api
|
||||
module github.com/docker/compose-cli
|
||||
|
||||
go 1.15
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
|
||||
flag "github.com/spf13/pflag"
|
||||
|
||||
"github.com/docker/api/utils"
|
||||
"github.com/docker/compose-cli/utils"
|
||||
)
|
||||
|
||||
var managementCommands = []string{
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue