From d0718ae4b793545ee2fe5b45d9b11a36c46a30f2 Mon Sep 17 00:00:00 2001 From: Sam McLeod Date: Mon, 10 Jun 2024 15:57:44 +1000 Subject: [PATCH] feat: docker ollama run --- operations.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/operations.go b/operations.go index 7c4dca9..cf0d86f 100644 --- a/operations.go +++ b/operations.go @@ -21,7 +21,7 @@ import ( func runModel(model string, cfg *config.Config) tea.Cmd { // if config is set to run in docker container, run the mode using runDocker if cfg.DockerContainer != "" && cfg.DockerContainer != "false" { - return runDocker(strings.Split(model, " "), cfg.DockerContainer) + return runDocker(cfg.DockerContainer, model) } ollamaPath, err := exec.LookPath("ollama") @@ -38,7 +38,7 @@ func runModel(model string, cfg *config.Config) tea.Cmd { }) } -func runDocker(params []string, container string) tea.Cmd { +func runDocker(container string, model string) tea.Cmd { dockerPath, err := exec.LookPath("docker") if err != nil { logging.ErrorLogger.Printf("Error finding docker binary: %v\n", err) @@ -46,8 +46,7 @@ func runDocker(params []string, container string) tea.Cmd { } // parse the params into a list of arguments to supply to docker exec - args := []string{"exec", container, "ollama"} - args = append(args, params...) + args := []string{"exec", "-it", container, "ollama", "run", model} c := exec.Command(dockerPath, args...) return tea.ExecProcess(c, func(err error) tea.Msg {