feat: allow to override the image default action

A default action can be defined inside the image runx manifest. Allow to define a different one in the local .docker/runx.yaml file. Signed-off-by: Yves Brissaud <[email protected]>
eunomie · Oct 9, 2024 · 7550b60 · 7550b60
1 parent 4a49b6f
commit 7550b60
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/internal/commands/root/root.go b/internal/commands/root/root.go
@@ -1,7 +1,6 @@
 package root
 
 import (
-	"cmp"
 	"context"
 	"fmt"
 	"io"
@@ -95,7 +94,7 @@ func NewCmd(dockerCli command.Cli, isPlugin bool) *cobra.Command {
 					return nil
 				}
 
-				action = cmp.Or(action, rk.Config.Default)
+				action = selectAction(action, lc.Images[src], rk.Config.Default)
 
 				if list || action == "" {
 					if tui.IsATTY(dockerCli.In().FD()) {
@@ -176,6 +175,18 @@ func run(ctx context.Context, out io.Writer, rk *runkit.RunKit, action string) e
 	return runnable.Run(ctx)
 }
 
+func selectAction(action string, conf runkit.ConfigImage, defaultAction string) string {
+	if action != "" {
+		return action
+	}
+
+	if conf.Default != "" {
+		return conf.Default
+	}
+
+	return defaultAction
+}
+
 func commandName(isPlugin bool) string {
 	name := constants.SubCommandName
 	if !isPlugin {

diff --git a/runkit/types.go b/runkit/types.go
@@ -33,7 +33,12 @@ type (
 	ActionType string
 
 	LocalConfig struct {
-		Ref string `yaml:"ref,omitempty" json:"ref,omitempty"`
+		Ref    string                 `yaml:"ref,omitempty" json:"ref,omitempty"`
+		Images map[string]ConfigImage `yaml:"images,omitempty" json:"images,omitempty"`
+	}
+
+	ConfigImage struct {
+		Default string `yaml:"default,omitempty" json:"default,omitempty"`
 	}
 )