Merge pull request #55 from docker/standalone-refinement

standalone: fix Compose hostname for CE/Cloud and implement logs for CE

Author: xenoscopic

commands/compose.go

@@ -5,9 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"slices"
+	"strconv"
 	"strings"
 
 	"github.com/docker/model-cli/desktop"
+	"github.com/docker/model-cli/pkg/standalone"
 	"github.com/spf13/cobra"
 )
 
@@ -51,7 +53,7 @@ func newUpCommand() *cobra.Command {
 				_ = setenv("URL", modelRunner.URL("/engines/v1/"))
 			} else if kind == desktop.ModelRunnerEngineKindMoby || kind == desktop.ModelRunnerEngineKindCloud {
 				// TODO: Find a more robust solution in Moby-like environments.
-				_ = setenv("URL", "http://172.17.0.1:12434/engines/v1/")
+				_ = setenv("URL", "http://host.docker.internal:"+strconv.Itoa(standalone.DefaultControllerPort)+"/engines/v1/")
 			}
 			return nil
 		},

commands/logs.go

@@ -2,14 +2,19 @@ package commands
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
 	"os/signal"
 	"path/filepath"
 	"runtime"
 
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/model-cli/commands/completion"
+	"github.com/docker/model-cli/desktop"
+	"github.com/docker/model-cli/pkg/standalone"
 	"github.com/nxadm/tail"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
@@ -26,6 +31,32 @@ func newLogsCmd() *cobra.Command {
 				return err
 			}
 
+			// If we're running in standalone mode, then print the container
+			// logs.
+			if modelRunner.EngineKind() == desktop.ModelRunnerEngineKindMoby {
+				dockerClient, err := desktop.DockerClientForContext(dockerCLI, dockerCLI.CurrentContext())
+				if err != nil {
+					return fmt.Errorf("failed to create Docker client: %w", err)
+				}
+				ctrID, _, err := standalone.FindControllerContainer(cmd.Context(), dockerClient)
+				if err != nil {
+					return fmt.Errorf("unable to identify Model Runner container: %w", err)
+				} else if ctrID == "" {
+					return errors.New("unable to identify Model Runner container")
+				}
+				log, err := dockerClient.ContainerLogs(cmd.Context(), ctrID, container.LogsOptions{
+					ShowStdout: true,
+					ShowStderr: true,
+					Follow:     follow,
+				})
+				if err != nil {
+					return fmt.Errorf("unable to query Model Runner container logs: %w", err)
+				}
+				defer log.Close()
+				_, err = stdcopy.StdCopy(os.Stdout, os.Stderr, log)
+				return err
+			}
+
 			var logFilePath string
 			switch {
 			case runtime.GOOS == "darwin":

vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go

@@ -115,6 +115,7 @@ github.com/docker/docker/internal/multierror
 github.com/docker/docker/pkg/atomicwriter
 github.com/docker/docker/pkg/homedir
 github.com/docker/docker/pkg/jsonmessage
+github.com/docker/docker/pkg/stdcopy
 github.com/docker/docker/registry
 # github.com/docker/docker-credential-helpers v0.9.3
 ## explicit; go 1.21