feat: add auto pull image at boot time (#506)

Co-authored-by: mirkoCrobu <mirkocrobu@NB-0531.localdomain>

Author: mirkoCrobu

cmd/arduino-app-cli/daemon/daemon.go

@@ -20,12 +20,29 @@ import (
 )
 
 func NewDaemonCmd(version string) *cobra.Command {
+	var autoPull bool
 	daemonCmd := &cobra.Command{
 		Use:   "daemon",
 		Short: "Run an HTTP server to expose arduino-app-cli functionality thorough REST API",
 		Run: func(cmd *cobra.Command, args []string) {
 			daemonPort, _ := cmd.Flags().GetString("port")
 
+			if autoPull {
+				go func() {
+					slog.Info("Auto-pull enabled, starting background process...")
+					err := orchestrator.SystemInit(
+						cmd.Context(),
+						servicelocator.GetUsedPythonImageTag(),
+						servicelocator.GetStaticStore(),
+					)
+					if err != nil {
+						slog.Error("Auto-pull process failed", slog.String("error", err.Error()))
+					} else {
+						slog.Info("Auto-pull process completed.")
+					}
+				}()
+			}
+
 			// start the default app in the background
 			go func() {
 				slog.Info("Starting default app")
@@ -46,6 +63,7 @@ func NewDaemonCmd(version string) *cobra.Command {
 		},
 	}
 	daemonCmd.Flags().String("port", "8080", "The TCP port the daemon will listen to")
+	daemonCmd.Flags().BoolVarP(&autoPull, "auto-pull", "p", false, "Enable auto-pull of all app images on startup")
 	return daemonCmd
 }
 

cmd/arduino-app-cli/internal/servicelocator/servicelocator.go

@@ -1,3 +1,5 @@
+// The servicelocator pkg should be used only under cmd/arduino-app-cli as a convenience to build our DI.
+
 package servicelocator
 
 import (

cmd/arduino-app-cli/system/system.go

@@ -1,20 +1,10 @@
 package system
 
 import (
-	"context"
-	"io/fs"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/arduino/go-paths-helper"
-	"github.com/compose-spec/compose-go/v2/loader"
-	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/spf13/cobra"
-	"go.bug.st/f"
 
 	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/servicelocator"
-	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
 )
 
 func NewSystemCmd() *cobra.Command {
@@ -33,82 +23,9 @@ func newDownloadImage() *cobra.Command {
 		Use:  "init",
 		Args: cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			return SystemInit(cmd.Context())
+			return orchestrator.SystemInit(cmd.Context(), servicelocator.GetUsedPythonImageTag(), servicelocator.GetStaticStore())
 		},
 	}
 
 	return cmd
 }
-
-// SystemInit pulls necessary Docker images.
-func SystemInit(ctx context.Context) error {
-	preInstallContainer := []string{
-		"ghcr.io/bcmi-labs/arduino/appslab-python-apps-base:" + servicelocator.GetUsedPythonImageTag(),
-	}
-	additionalContainers, err := parseAllModelsRunnerImageTag()
-	if err != nil {
-		return err
-	}
-	preInstallContainer = append(preInstallContainer, additionalContainers...)
-
-	stdout, _, err := feedback.DirectStreams()
-	if err != nil {
-		feedback.Fatal(err.Error(), feedback.ErrBadArgument)
-		return nil
-	}
-
-	for _, container := range preInstallContainer {
-		cmd, err := paths.NewProcess(nil, "docker", "pull", container)
-		if err != nil {
-			return err
-		}
-		cmd.RedirectStderrTo(stdout)
-		cmd.RedirectStdoutTo(stdout)
-		if err := cmd.RunWithinContext(ctx); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func parseAllModelsRunnerImageTag() ([]string, error) {
-	assets, err := servicelocator.GetStaticStore().GetAssetsFolder()
-	if err != nil {
-		return nil, err
-	}
-	baseDir := path.Join("compose", "arduino")
-	bricks, err := fs.ReadDir(assets, baseDir)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make([]string, 0, len(bricks))
-	for _, brick := range bricks {
-		composeFile := path.Join(baseDir, brick.Name(), "brick_compose.yaml")
-		content, err := fs.ReadFile(assets, composeFile)
-		if err != nil {
-			return nil, err
-		}
-		prj, err := loader.LoadWithContext(
-			context.Background(),
-			types.ConfigDetails{
-				ConfigFiles: []types.ConfigFile{{Content: content}},
-				Environment: types.NewMapping(os.Environ()),
-			},
-			func(o *loader.Options) { o.SetProjectName("test", false) },
-		)
-		if err != nil {
-			return nil, err
-		}
-		for _, v := range prj.Services {
-			// Add only if the image comes from arduino
-			if strings.HasPrefix(v.Image, "ghcr.io/bcmi-labs/arduino/") ||
-				// TODO: add the correct ecr prefix as soon as we have it in production
-				strings.HasPrefix(v.Image, "public.ecr.aws/") {
-				result = append(result, v.Image)
-			}
-		}
-	}
-
-	return f.Uniq(result), nil
-}

internal/orchestrator/system.go

@@ -1 +1,90 @@
 package orchestrator
+
+import (
+	"context"
+	"io/fs"
+	"os"
+	"path"
+	"strings"
+
+	"github.com/arduino/go-paths-helper"
+	"github.com/compose-spec/compose-go/v2/loader"
+	"github.com/compose-spec/compose-go/v2/types"
+	"go.bug.st/f"
+
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/store"
+)
+
+// SystemInit pulls necessary Docker images.
+func SystemInit(ctx context.Context, pythonImageTag string, staticStore *store.StaticStore) error {
+	preInstallContainer := []string{
+		"ghcr.io/bcmi-labs/arduino/appslab-python-apps-base:" + pythonImageTag,
+	}
+	additionalContainers, err := parseAllModelsRunnerImageTag(staticStore)
+	if err != nil {
+		return err
+	}
+	preInstallContainer = append(preInstallContainer, additionalContainers...)
+
+	stdout, _, err := feedback.DirectStreams()
+	if err != nil {
+		feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+		return nil
+	}
+
+	for _, container := range preInstallContainer {
+		cmd, err := paths.NewProcess(nil, "docker", "pull", container)
+		if err != nil {
+			return err
+		}
+		cmd.RedirectStderrTo(stdout)
+		cmd.RedirectStdoutTo(stdout)
+		if err := cmd.RunWithinContext(ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func parseAllModelsRunnerImageTag(staticStore *store.StaticStore) ([]string, error) {
+	assets, err := staticStore.GetAssetsFolder()
+	if err != nil {
+		return nil, err
+	}
+	baseDir := path.Join("compose", "arduino")
+	bricks, err := fs.ReadDir(assets, baseDir)
+	if err != nil {
+		return nil, err
+	}
+
+	result := make([]string, 0, len(bricks))
+	for _, brick := range bricks {
+		composeFile := path.Join(baseDir, brick.Name(), "brick_compose.yaml")
+		content, err := fs.ReadFile(assets, composeFile)
+		if err != nil {
+			return nil, err
+		}
+		prj, err := loader.LoadWithContext(
+			context.Background(),
+			types.ConfigDetails{
+				ConfigFiles: []types.ConfigFile{{Content: content}},
+				Environment: types.NewMapping(os.Environ()),
+			},
+			func(o *loader.Options) { o.SetProjectName("test", false) },
+		)
+		if err != nil {
+			return nil, err
+		}
+		for _, v := range prj.Services {
+			// Add only if the image comes from arduino
+			if strings.HasPrefix(v.Image, "ghcr.io/bcmi-labs/arduino/") ||
+				// TODO: add the correct ecr prefix as soon as we have it in production
+				strings.HasPrefix(v.Image, "public.ecr.aws/") {
+				result = append(result, v.Image)
+			}
+		}
+	}
+
+	return f.Uniq(result), nil
+}