From 1683edd2e70d723d538762027bfe2ca7aaf6cdd6 Mon Sep 17 00:00:00 2001 From: Eddort Date: Fri, 7 Jun 2024 10:02:18 +0200 Subject: [PATCH 1/3] fix: module name --- internal/cli/cli.go | 3 ++- internal/cli/messages.go | 4 ++-- internal/command/cmd_docker_run.go | 8 ++++---- internal/command/cmd_session.go | 4 ++-- internal/command/cmd_show_config.go | 4 ++-- internal/command/command.go | 2 +- internal/config/validator.go | 2 +- internal/docker/build.go | 2 +- internal/docker/image.go | 6 +++--- internal/docker/runner.go | 3 ++- internal/platform/platform.go | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 2178652..873366d 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -1,9 +1,10 @@ package cli import ( - "cubx/internal/config" "flag" "fmt" + + "github.com/eddort/cubx/internal/config" ) func ShowHelpMessage(configuration config.ProgramConfig) { diff --git a/internal/cli/messages.go b/internal/cli/messages.go index ada7d2e..60cc026 100644 --- a/internal/cli/messages.go +++ b/internal/cli/messages.go @@ -1,10 +1,10 @@ package cli import ( - "cubx/internal/config" - "cubx/internal/tui" "flag" "fmt" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/tui" "sort" "strings" ) diff --git a/internal/command/cmd_docker_run.go b/internal/command/cmd_docker_run.go index b170c4c..3a7f9a4 100644 --- a/internal/command/cmd_docker_run.go +++ b/internal/command/cmd_docker_run.go @@ -1,11 +1,11 @@ package command import ( - "cubx/internal/config" - "cubx/internal/docker" - "cubx/internal/registry" - "cubx/internal/tui" "fmt" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/docker" + "github.com/eddort/cubx/internal/registry" + "github.com/eddort/cubx/internal/tui" "path/filepath" "strings" diff --git a/internal/command/cmd_session.go b/internal/command/cmd_session.go index 4013166..b406163 100644 --- a/internal/command/cmd_session.go +++ b/internal/command/cmd_session.go @@ -1,8 +1,8 @@ package command import ( - "cubx/internal/config" - "cubx/internal/session" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/session" ) type SessionCommand struct { diff --git a/internal/command/cmd_show_config.go b/internal/command/cmd_show_config.go index 69c3719..98cc000 100644 --- a/internal/command/cmd_show_config.go +++ b/internal/command/cmd_show_config.go @@ -1,9 +1,9 @@ package command import ( - "cubx/internal/config" - "cubx/internal/tui" "fmt" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/tui" ) type ShowConfigCommand struct { diff --git a/internal/command/command.go b/internal/command/command.go index 56f0b7a..9e98f3d 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -1,8 +1,8 @@ package command import ( - "cubx/internal/config" "errors" + "github.com/eddort/cubx/internal/config" ) var ErrCommandNotFound = errors.New("command is nil") diff --git a/internal/config/validator.go b/internal/config/validator.go index 1be0e68..75e4ec6 100644 --- a/internal/config/validator.go +++ b/internal/config/validator.go @@ -1,8 +1,8 @@ package config import ( - "cubx/internal/platform" "fmt" + "github.com/eddort/cubx/internal/platform" "strings" "github.com/go-playground/validator/v10" diff --git a/internal/docker/build.go b/internal/docker/build.go index cbd2890..2c60487 100644 --- a/internal/docker/build.go +++ b/internal/docker/build.go @@ -4,8 +4,8 @@ import ( "archive/tar" "bytes" "context" - "cubx/internal/streams" "fmt" + "github.com/eddort/cubx/internal/streams" "io" "os" "path/filepath" diff --git a/internal/docker/image.go b/internal/docker/image.go index cffc42d..31bd2b8 100644 --- a/internal/docker/image.go +++ b/internal/docker/image.go @@ -2,10 +2,10 @@ package docker import ( "context" - "cubx/internal/config" - "cubx/internal/platform" - "cubx/internal/streams" "fmt" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/platform" + "github.com/eddort/cubx/internal/streams" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" diff --git a/internal/docker/runner.go b/internal/docker/runner.go index 6e04cd5..4d84a16 100644 --- a/internal/docker/runner.go +++ b/internal/docker/runner.go @@ -2,13 +2,14 @@ package docker import ( "context" - "cubx/internal/config" "fmt" "io" "os" "os/signal" "syscall" + "github.com/eddort/cubx/internal/config" + "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" ) diff --git a/internal/platform/platform.go b/internal/platform/platform.go index da5358e..83d109b 100644 --- a/internal/platform/platform.go +++ b/internal/platform/platform.go @@ -1,8 +1,8 @@ package platform import ( - "cubx/internal/registry" "fmt" + "github.com/eddort/cubx/internal/registry" ) type OsArch struct { From 673d147e2ee9b16a00c426a4a7cc1a4575f480e4 Mon Sep 17 00:00:00 2001 From: Eddort Date: Fri, 7 Jun 2024 10:03:36 +0200 Subject: [PATCH 2/3] fix: add go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 230a7f6..3f6b491 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module cubx +module github.com/eddort/cubx go 1.21 From 373e6e429bba3bc6d2d8278e2c993254ceba4b6c Mon Sep 17 00:00:00 2001 From: Eddort Date: Fri, 7 Jun 2024 10:06:21 +0200 Subject: [PATCH 3/3] fix: add main.go --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 5bae3e6..0b90c5c 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,11 @@ package main import ( - "cubx/internal/cli" - "cubx/internal/command" - "cubx/internal/config" - "cubx/internal/tui" "errors" + "github.com/eddort/cubx/internal/cli" + "github.com/eddort/cubx/internal/command" + "github.com/eddort/cubx/internal/config" + "github.com/eddort/cubx/internal/tui" "os" )