tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 14:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move server => cli

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-01-15 15:32:21 +01:00
parent 65f53dff43
commit cd10d8eaa4
23 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cmd/serve.go
View File

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

0
server/contextserverstream.go → cli/server/contextserverstream.go
View File

2
server/interceptor.go → cli/server/interceptor.go
View File

@ -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/cli/server/proxy"
"github.com/docker/compose-cli/config" "github.com/docker/compose-cli/config"
apicontext "github.com/docker/compose-cli/context" apicontext "github.com/docker/compose-cli/context"
"github.com/docker/compose-cli/context/store" "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 // key is the key where the current docker context is stored in the metadata

0
server/interceptor_test.go → cli/server/interceptor_test.go
View File

2
server/metrics.go → cli/server/metrics.go
View File

@ -22,7 +22,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/metrics"
"github.com/docker/compose-cli/server/proxy" "github.com/docker/compose-cli/cli/server/proxy"
) )
var ( var (

2
server/metrics_test.go → cli/server/metrics_test.go
View File

@ -34,13 +34,13 @@ import (
"github.com/docker/compose-cli/api/secrets" "github.com/docker/compose-cli/api/secrets"
"github.com/docker/compose-cli/api/volumes" "github.com/docker/compose-cli/api/volumes"
"github.com/docker/compose-cli/cli/metrics" "github.com/docker/compose-cli/cli/metrics"
"github.com/docker/compose-cli/cli/server/proxy"
"github.com/docker/compose-cli/errdefs" "github.com/docker/compose-cli/errdefs"
composev1 "github.com/docker/compose-cli/protos/compose/v1" composev1 "github.com/docker/compose-cli/protos/compose/v1"
containersv1 "github.com/docker/compose-cli/protos/containers/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1"
contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
streamsv1 "github.com/docker/compose-cli/protos/streams/v1" streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
volumesv1 "github.com/docker/compose-cli/protos/volumes/v1" volumesv1 "github.com/docker/compose-cli/protos/volumes/v1"
"github.com/docker/compose-cli/server/proxy"
) )
func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) { func TestAllMethodsHaveCorrespondingCliCommand(t *testing.T) {

0
server/proxy/compose.go → cli/server/proxy/compose.go
View File

2
server/proxy/containers.go → cli/server/proxy/containers.go
View File

@ -25,9 +25,9 @@ import (
specs "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/docker/compose-cli/api/containers" "github.com/docker/compose-cli/api/containers"
"github.com/docker/compose-cli/cli/server/proxy/streams"
"github.com/docker/compose-cli/formatter" "github.com/docker/compose-cli/formatter"
containersv1 "github.com/docker/compose-cli/protos/containers/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1"
"github.com/docker/compose-cli/server/proxy/streams"
) )
func portsToGrpc(ports []containers.Port) []*containersv1.Port { func portsToGrpc(ports []containers.Port) []*containersv1.Port {

0
server/proxy/containers_test.go → cli/server/proxy/containers_test.go
View File

0
server/proxy/contexts.go → cli/server/proxy/contexts.go
View File

0
server/proxy/contexts_test.go → cli/server/proxy/contexts_test.go
View File

2
server/proxy/proxy.go → cli/server/proxy/proxy.go
View File

@ -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/cli/server/proxy/streams"
"github.com/docker/compose-cli/config" "github.com/docker/compose-cli/config"
composev1 "github.com/docker/compose-cli/protos/compose/v1" composev1 "github.com/docker/compose-cli/protos/compose/v1"
containersv1 "github.com/docker/compose-cli/protos/containers/v1" containersv1 "github.com/docker/compose-cli/protos/containers/v1"
contextsv1 "github.com/docker/compose-cli/protos/contexts/v1" contextsv1 "github.com/docker/compose-cli/protos/contexts/v1"
streamsv1 "github.com/docker/compose-cli/protos/streams/v1" streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
volumesv1 "github.com/docker/compose-cli/protos/volumes/v1" volumesv1 "github.com/docker/compose-cli/protos/volumes/v1"
"github.com/docker/compose-cli/server/proxy/streams"
) )
type clientKey struct{} type clientKey struct{}

2
server/proxy/streams.go → cli/server/proxy/streams.go
View File

@ -21,8 +21,8 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"github.com/docker/compose-cli/cli/server/proxy/streams"
streamsv1 "github.com/docker/compose-cli/protos/streams/v1" streamsv1 "github.com/docker/compose-cli/protos/streams/v1"
"github.com/docker/compose-cli/server/proxy/streams"
) )
func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error { func (p *proxy) NewStream(stream streamsv1.Streaming_NewStreamServer) error {

0
server/proxy/streams/io.go → cli/server/proxy/streams/io.go
View File

0
server/proxy/streams/logs.go → cli/server/proxy/streams/logs.go
View File

0
server/proxy/streams/logs_test.go → cli/server/proxy/streams/logs_test.go
View File

0
server/proxy/streams/stream.go → cli/server/proxy/streams/stream.go
View File

0
server/proxy/streams/stream_test.go → cli/server/proxy/streams/stream_test.go
View File

0
server/proxy/volumes.go → cli/server/proxy/volumes.go
View File

0
server/server.go → cli/server/server.go
View File

0
server/socket_unix.go → cli/server/socket_unix.go
View File

0
server/socket_windows.go → cli/server/socket_windows.go
View File

8
import-restrictions.yaml
View File

@ -5,29 +5,21 @@
- github.com/docker/compose-cli/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/compose-cli/example - github.com/docker/compose-cli/example
- github.com/docker/compose-cli/local - github.com/docker/compose-cli/local
- github.com/docker/compose-cli/metrics
- github.com/docker/compose-cli/server
- path: ./ecs - path: ./ecs
forbiddenImports: forbiddenImports:
- github.com/docker/compose-cli/aci - github.com/docker/compose-cli/aci
- github.com/docker/compose-cli/cli - github.com/docker/compose-cli/cli
- github.com/docker/compose-cli/example - github.com/docker/compose-cli/example
- github.com/docker/compose-cli/local - github.com/docker/compose-cli/local
- github.com/docker/compose-cli/metrics
- github.com/docker/compose-cli/server
- path: ./example - path: ./example
forbiddenImports: forbiddenImports:
- github.com/docker/compose-cli/aci - github.com/docker/compose-cli/aci
- github.com/docker/compose-cli/cli - github.com/docker/compose-cli/cli
- github.com/docker/compose-cli/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/compose-cli/local - github.com/docker/compose-cli/local
- github.com/docker/compose-cli/metrics
- github.com/docker/compose-cli/server
- path: ./local - path: ./local
forbiddenImports: forbiddenImports:
- github.com/docker/compose-cli/aci - github.com/docker/compose-cli/aci
- github.com/docker/compose-cli/cli - github.com/docker/compose-cli/cli
- github.com/docker/compose-cli/ecs - github.com/docker/compose-cli/ecs
- github.com/docker/compose-cli/example - github.com/docker/compose-cli/example
- github.com/docker/compose-cli/metrics
- github.com/docker/compose-cli/server