mirror of
https://github.com/docker/compose.git
synced 2025-07-24 06:04:57 +02:00
Move config => api/config
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
parent
f1ac6d4fdc
commit
2a8c24e4ff
@ -22,8 +22,8 @@ import (
|
|||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
"github.com/docker/compose-cli/api/context/store"
|
"github.com/docker/compose-cli/api/context/store"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func useCommand() *cobra.Command {
|
func useCommand() *cobra.Command {
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
|
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
|
|
||||||
"github.com/docker/compose-cli/config"
|
"github.com/docker/compose-cli/api/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ConfigFlags are the global CLI flags
|
// ConfigFlags are the global CLI flags
|
||||||
|
@ -32,6 +32,7 @@ import (
|
|||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
apicontext "github.com/docker/compose-cli/api/context"
|
apicontext "github.com/docker/compose-cli/api/context"
|
||||||
"github.com/docker/compose-cli/api/context/store"
|
"github.com/docker/compose-cli/api/context/store"
|
||||||
"github.com/docker/compose-cli/api/errdefs"
|
"github.com/docker/compose-cli/api/errdefs"
|
||||||
@ -45,7 +46,6 @@ import (
|
|||||||
"github.com/docker/compose-cli/cli/metrics"
|
"github.com/docker/compose-cli/cli/metrics"
|
||||||
"github.com/docker/compose-cli/cli/mobycli"
|
"github.com/docker/compose-cli/cli/mobycli"
|
||||||
cliopts "github.com/docker/compose-cli/cli/options"
|
cliopts "github.com/docker/compose-cli/cli/options"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
|
|
||||||
// Backend registrations
|
// Backend registrations
|
||||||
_ "github.com/docker/compose-cli/aci"
|
_ "github.com/docker/compose-cli/aci"
|
||||||
|
@ -24,11 +24,11 @@ import (
|
|||||||
|
|
||||||
"gotest.tools/v3/assert"
|
"gotest.tools/v3/assert"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
"github.com/docker/compose-cli/cli/cmd"
|
"github.com/docker/compose-cli/cli/cmd"
|
||||||
"github.com/docker/compose-cli/cli/cmd/context"
|
"github.com/docker/compose-cli/cli/cmd/context"
|
||||||
"github.com/docker/compose-cli/cli/cmd/login"
|
"github.com/docker/compose-cli/cli/cmd/login"
|
||||||
"github.com/docker/compose-cli/cli/cmd/run"
|
"github.com/docker/compose-cli/cli/cmd/run"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var contextSetConfig = []byte(`{
|
var contextSetConfig = []byte(`{
|
||||||
|
@ -25,10 +25,10 @@ import (
|
|||||||
"google.golang.org/grpc/metadata"
|
"google.golang.org/grpc/metadata"
|
||||||
|
|
||||||
"github.com/docker/compose-cli/api/client"
|
"github.com/docker/compose-cli/api/client"
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
apicontext "github.com/docker/compose-cli/api/context"
|
apicontext "github.com/docker/compose-cli/api/context"
|
||||||
"github.com/docker/compose-cli/api/context/store"
|
"github.com/docker/compose-cli/api/context/store"
|
||||||
"github.com/docker/compose-cli/cli/server/proxy"
|
"github.com/docker/compose-cli/cli/server/proxy"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// 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
|
||||||
|
@ -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/compose-cli/api/config"
|
||||||
apicontext "github.com/docker/compose-cli/api/context"
|
apicontext "github.com/docker/compose-cli/api/context"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func testContext(t *testing.T) context.Context {
|
func testContext(t *testing.T) context.Context {
|
||||||
|
@ -19,9 +19,9 @@ package proxy
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
"github.com/docker/compose-cli/api/context/store"
|
"github.com/docker/compose-cli/api/context/store"
|
||||||
contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1"
|
contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type contextsProxy struct {
|
type contextsProxy struct {
|
||||||
|
@ -21,13 +21,13 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/docker/compose-cli/api/client"
|
"github.com/docker/compose-cli/api/client"
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
composev1 "github.com/docker/compose-cli/cli/server/protos/compose/v1"
|
composev1 "github.com/docker/compose-cli/cli/server/protos/compose/v1"
|
||||||
containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1"
|
containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1"
|
||||||
contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1"
|
contextsv1 "github.com/docker/compose-cli/cli/server/protos/contexts/v1"
|
||||||
streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1"
|
streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1"
|
||||||
volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1"
|
volumesv1 "github.com/docker/compose-cli/cli/server/protos/volumes/v1"
|
||||||
"github.com/docker/compose-cli/cli/server/proxy/streams"
|
"github.com/docker/compose-cli/cli/server/proxy/streams"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type clientKey struct{}
|
type clientKey struct{}
|
||||||
|
@ -24,7 +24,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/docker/compose-cli/api/compose"
|
"github.com/docker/compose-cli/api/compose"
|
||||||
"github.com/docker/compose-cli/config"
|
"github.com/docker/compose-cli/api/config"
|
||||||
|
|
||||||
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"
|
||||||
|
@ -32,8 +32,8 @@ import (
|
|||||||
"github.com/docker/docker/registry"
|
"github.com/docker/docker/registry"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
"github.com/docker/compose-cli/api/progress"
|
"github.com/docker/compose-cli/api/progress"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *composeService) Pull(ctx context.Context, project *types.Project) error {
|
func (s *composeService) Pull(ctx context.Context, project *types.Project) error {
|
||||||
|
@ -25,8 +25,8 @@ import (
|
|||||||
|
|
||||||
"github.com/docker/buildx/driver"
|
"github.com/docker/buildx/driver"
|
||||||
|
|
||||||
|
"github.com/docker/compose-cli/api/config"
|
||||||
"github.com/docker/compose-cli/api/progress"
|
"github.com/docker/compose-cli/api/progress"
|
||||||
"github.com/docker/compose-cli/config"
|
|
||||||
|
|
||||||
"github.com/compose-spec/compose-go/types"
|
"github.com/compose-spec/compose-go/types"
|
||||||
cliconfig "github.com/docker/cli/cli/config"
|
cliconfig "github.com/docker/cli/cli/config"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user