change docker compose using docker api sdk

Argus-Labs · Aug 7, 2024 · dbdc41d · dbdc41d
1 parent 69e78c9
commit dbdc41d
Show file tree

Hide file tree

Showing 14 changed files with 996 additions and 38 deletions.
diff --git a/cmd/world/cardinal/dev.go b/cmd/world/cardinal/dev.go
@@ -18,8 +18,8 @@ import (
 
 	"pkg.world.dev/world-cli/common"
 	"pkg.world.dev/world-cli/common/config"
+	"pkg.world.dev/world-cli/common/docker"
 	"pkg.world.dev/world-cli/common/logger"
-	"pkg.world.dev/world-cli/common/teacmd"
 	"pkg.world.dev/world-cli/tea/style"
 )
 
@@ -231,7 +231,7 @@ func startRedis(ctx context.Context, cfg *config.Config) error {
 	// Start Redis container
 	group.Go(func() error {
 		cfg.Detach = true
-		if err := teacmd.DockerStart(cfg, []teacmd.DockerService{teacmd.DockerServiceRedis}); err != nil {
+		if err := docker.Start(cfg, docker.Redis); err != nil {
 			return eris.Wrap(err, "Encountered an error with Redis")
 		}
 		return nil
@@ -243,7 +243,7 @@ func startRedis(ctx context.Context, cfg *config.Config) error {
 	// 2) The parent context is canceled for whatever reason.
 	group.Go(func() error {
 		<-ctx.Done()
-		if err := teacmd.DockerStop([]teacmd.DockerService{teacmd.DockerServiceRedis}); err != nil {
+		if err := docker.Stop(cfg, docker.Redis); err != nil {
 			return err
 		}
 		return nil

diff --git a/cmd/world/cardinal/purge.go b/cmd/world/cardinal/purge.go
@@ -5,7 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"pkg.world.dev/world-cli/common/teacmd"
+	"pkg.world.dev/world-cli/common/config"
+	"pkg.world.dev/world-cli/common/docker"
 )
 
 /////////////////
@@ -19,8 +20,13 @@ var purgeCmd = &cobra.Command{
 	Short: "Stop and reset the state of your Cardinal game shard",
 	Long: `Stop and reset the state of your Cardinal game shard.
 This command stop all Docker services and remove all Docker volumes.`,
-	RunE: func(_ *cobra.Command, _ []string) error {
-		err := teacmd.DockerPurge()
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		cfg, err := config.GetConfig(cmd)
+		if err != nil {
+			return err
+		}
+
+		err = docker.Purge(cfg)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/world/cardinal/restart.go b/cmd/world/cardinal/restart.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"pkg.world.dev/world-cli/common/config"
-	"pkg.world.dev/world-cli/common/teacmd"
+	"pkg.world.dev/world-cli/common/docker"
 )
 
 // restartCmd restarts your Cardinal game shard stack
@@ -31,18 +31,7 @@ This will restart the following Docker services:
 			return err
 		}
 
-		if cfg.Debug {
-			err = teacmd.DockerRestart(cfg, []teacmd.DockerService{
-				teacmd.DockerServiceCardinalDebug,
-				teacmd.DockerServiceNakama,
-			})
-		} else {
-			err = teacmd.DockerRestart(cfg, []teacmd.DockerService{
-				teacmd.DockerServiceCardinal,
-				teacmd.DockerServiceNakama,
-			})
-		}
-
+		err = docker.Restart(cfg, docker.Cardinal, docker.Nakama)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/world/cardinal/start.go b/cmd/world/cardinal/start.go
@@ -11,7 +11,7 @@ import (
 
 	"pkg.world.dev/world-cli/common"
 	"pkg.world.dev/world-cli/common/config"
-	"pkg.world.dev/world-cli/common/teacmd"
+	"pkg.world.dev/world-cli/common/docker"
 )
 
 /////////////////
@@ -112,7 +112,7 @@ This will start the following Docker services and its dependencies:
 
 		// Start the World Engine stack
 		group.Go(func() error {
-			if err := teacmd.DockerStartAll(cfg); err != nil {
+			if err := docker.Start(cfg, docker.NakamaDB, docker.Redis, docker.Cardinal, docker.Nakama); err != nil {
 				return eris.Wrap(err, "Encountered an error with Docker")
 			}
 			return eris.Wrap(ErrGracefulExit, "Stack terminated")

diff --git a/cmd/world/cardinal/stop.go b/cmd/world/cardinal/stop.go
@@ -5,7 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"pkg.world.dev/world-cli/common/teacmd"
+	"pkg.world.dev/world-cli/common/config"
+	"pkg.world.dev/world-cli/common/docker"
 )
 
 /////////////////
@@ -23,8 +24,13 @@ This will stop the following Docker services:
 - Cardinal (Game shard)
 - Nakama (Relay) + DB
 - Redis (Cardinal dependency)`,
-	RunE: func(_ *cobra.Command, _ []string) error {
-		err := teacmd.DockerStopAll()
+	RunE: func(cmd *cobra.Command, _ []string) error {
+		cfg, err := config.GetConfig(cmd)
+		if err != nil {
+			return err
+		}
+
+		err = docker.Stop(cfg, docker.Nakama, docker.Cardinal, docker.NakamaDB, docker.Redis)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/world/root/root_test.go b/cmd/world/root/root_test.go
@@ -132,7 +132,7 @@ func TestCreateStartStopRestartPurge(t *testing.T) {
 	assert.NilError(t, err)
 
 	// Start cardinal
-	rootCmd.SetArgs([]string{"cardinal", "start", "--build", "--detach", "--editor=false"})
+	rootCmd.SetArgs([]string{"cardinal", "start", "--detach", "--editor=false"})
 	err = rootCmd.Execute()
 	assert.NilError(t, err)