Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-09-01 07:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use config dir for serving API

Browse source 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
Christopher Crone 2020-05-20 15:56:07 +02:00
parent 058e6203a7
commit ebe3fbc180
2 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/cmd/serve.go
View file

@ -21,6 +21,7 @@ type serveOpts struct {
// ServeCommand returns the command to serve the API
func ServeCommand() *cobra.Command {
// FIXME(chris-crone): Should warn that specified context is ignored
var opts serveOpts
cmd := &cobra.Command{
Use: "serve",
@ -36,14 +37,12 @@ func ServeCommand() *cobra.Command {
}
func runServe(ctx context.Context, opts serveOpts) error {
s := server.New()
s := server.New(ctx)
listener, err := server.CreateListener(opts.address)
if err != nil {
return errors.Wrap(err, "listen address "+opts.address)
}
// nolint errcheck
defer listener.Close()
@ -71,11 +70,7 @@ type cliServer struct {
}
func (cs *cliServer) Contexts(ctx context.Context, request *cliv1.ContextsRequest) (*cliv1.ContextsResponse, error) {
s, err := store.New()
if err != nil {
logrus.Error(err)
return &cliv1.ContextsResponse{}, err
}
s := store.ContextStore(ctx)
contexts, err := s.List()
if err != nil {
logrus.Error(err)