chore: adjust code to changes in core

wabenet · Aug 30, 2024 · 450e430 · 450e430
1 parent 83b6cba
commit 450e430
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/pkg/command/build/command.go b/pkg/command/build/command.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo/pkg/core"
 )
@@ -13,6 +13,7 @@ type options struct {
 	noCache      bool
 	forceRebuild bool
 	forcePull    bool
+	runtime      string
 }
 
 func New(m plugin.Manager) *Command {
@@ -27,6 +28,7 @@ func New(m plugin.Manager) *Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			config := &api.BuildInfo{
 				ImageName:    args[0],
+				Builder:      opts.runtime,
 				NoCache:      opts.noCache,
 				ForceRebuild: opts.forceRebuild,
 				ForcePull:    opts.forcePull,
@@ -52,6 +54,9 @@ func New(m plugin.Manager) *Command {
 	flags.BoolVar(
 		&opts.forcePull, "pull", false,
 		"always attempt to pull base images")
+	flags.StringVarP(
+		&opts.runtime, "runtime", "r", "",
+		"select runtime plugin")
 
 	return &Command{cmd: cmd}
 }
diff --git a/pkg/command/build/plugin.go b/pkg/command/build/plugin.go
@@ -2,7 +2,7 @@ package build
 
 import (
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/command"
 )
@@ -25,7 +25,7 @@ func (p *Command) PluginInfo() *api.PluginInfo {
 	}
 }
 
-func (*Command) Init() (plugin.PluginConfig, error) {
+func (*Command) Init() (plugin.Config, error) {
 	return map[string]string{}, nil
 }
 

diff --git a/pkg/command/dodo/command.go b/pkg/command/dodo/command.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/command"
 	"go.szostok.io/version/extension"

diff --git a/pkg/command/dodo/plugin.go b/pkg/command/dodo/plugin.go
@@ -2,7 +2,7 @@ package dodo
 
 import (
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/command"
 )
@@ -25,7 +25,7 @@ func (p *Command) PluginInfo() *api.PluginInfo {
 	}
 }
 
-func (*Command) Init() (plugin.PluginConfig, error) {
+func (*Command) Init() (plugin.Config, error) {
 	return map[string]string{}, nil
 }
 

diff --git a/pkg/command/run/command.go b/pkg/command/run/command.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/config"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/command"
@@ -91,6 +91,9 @@ func (opts *options) createConfig(name string, command []string) (*api.Backdrop,
 	c := &api.Backdrop{
 		Name:    name,
 		Runtime: opts.runtime,
+		BuildInfo: &api.BuildInfo{
+			Builder: opts.runtime,
+		},
 		Entrypoint: &api.Entrypoint{
 			Interactive: opts.interactive,
 			Arguments:   command,

diff --git a/pkg/command/run/plugin.go b/pkg/command/run/plugin.go
@@ -2,7 +2,7 @@ package run
 
 import (
 	"github.com/spf13/cobra"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/command"
 )
@@ -25,7 +25,7 @@ func (p *Command) PluginInfo() *api.PluginInfo {
 	}
 }
 
-func (*Command) Init() (plugin.PluginConfig, error) {
+func (*Command) Init() (plugin.Config, error) {
 	return map[string]string{}, nil
 }
 

diff --git a/pkg/core/build.go b/pkg/core/build.go
@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/builder"
 	"github.com/wabenet/dodo-core/pkg/plugin/configuration"

diff --git a/pkg/core/run.go b/pkg/core/run.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 
 	log "github.com/hashicorp/go-hclog"
-	api "github.com/wabenet/dodo-core/api/v1alpha4"
+	api "github.com/wabenet/dodo-core/api/core/v1alpha5"
 	"github.com/wabenet/dodo-core/pkg/plugin"
 	"github.com/wabenet/dodo-core/pkg/plugin/configuration"
 	"github.com/wabenet/dodo-core/pkg/plugin/runtime"