feat: add custom driver

Author: FabianKramm

cmd/agent/daemon.go

@@ -4,16 +4,15 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/loft-sh/devpod/cmd/flags"
 	"github.com/loft-sh/devpod/pkg/agent"
-	"github.com/loft-sh/devpod/pkg/binaries"
 	"github.com/loft-sh/devpod/pkg/client/clientimplementation"
+	"github.com/loft-sh/devpod/pkg/driver/custom"
 	provider2 "github.com/loft-sh/devpod/pkg/provider"
 	"github.com/loft-sh/log"
 	"github.com/sirupsen/logrus"
@@ -145,7 +144,7 @@ func (cmd *DaemonCmd) doOnce(log log.Logger) {
 
 func (cmd *DaemonCmd) runShutdownCommand(workspace *provider2.AgentWorkspaceInfo, log log.Logger) {
 	// get environ
-	environ, err := toEnvironWithBinaries(cmd.AgentDir, workspace, log)
+	environ, err := custom.ToEnvironWithBinaries(workspace, log)
 	if err != nil {
 		log.Errorf("%v", err)
 		return
@@ -170,27 +169,6 @@ func (cmd *DaemonCmd) runShutdownCommand(workspace *provider2.AgentWorkspaceInfo
 	log.Infof("Successful ran command: %s", buf.String())
 }
 
-func toEnvironWithBinaries(agentDir string, workspace *provider2.AgentWorkspaceInfo, log log.Logger) ([]string, error) {
-	// get binaries dir
-	binariesDir, err := agent.GetAgentBinariesDir(agentDir, workspace.Workspace.Context, workspace.Workspace.ID)
-	if err != nil {
-		return nil, fmt.Errorf("error getting workspace %s binaries dir: %w", workspace.Workspace.ID, err)
-	}
-
-	// download binaries
-	agentBinaries, err := binaries.DownloadBinaries(workspace.Agent.Binaries, binariesDir, log)
-	if err != nil {
-		return nil, fmt.Errorf("error downloading workspace %s binaries: %w", workspace.Workspace.ID, err)
-	}
-
-	// get environ
-	environ := provider2.ToEnvironment(workspace.Workspace, workspace.Machine, workspace.Options, nil)
-	for k, v := range agentBinaries {
-		environ = append(environ, k+"="+v)
-	}
-	return environ, nil
-}
-
 func (cmd *DaemonCmd) initialTouch(log log.Logger) {
 	// get base folder
 	baseFolder, err := agent.FindAgentHomeFolder(cmd.AgentDir)

cmd/agent/workspace/up.go

@@ -129,7 +129,7 @@ func initWorkspace(ctx context.Context, cancel context.CancelFunc, workspaceInfo
 	// install docker in background
 	errChan := make(chan error, 1)
 	go func() {
-		if workspaceInfo.Agent.Driver == provider2.KubernetesDriver || workspaceInfo.Agent.Docker.Install == "false" {
+		if workspaceInfo.Agent.IsDockerDriver() || workspaceInfo.Agent.Docker.Install == "false" {
 			errChan <- nil
 		} else {
 			errChan <- InstallDocker(logger)

e2e/framework/agent_server.go

@@ -155,7 +155,7 @@ var _ = DevPodDescribe("devpod build test suite", func() {
 		framework.ExpectNoError(err)
 	})
 
-	ginkgo.It("build kubernetes buildkit", func() {
+	ginkgo.FIt("build kubernetes dockerless", func() {
 		ctx := context.Background()
 
 		f := framework.NewDefaultFramework(initialDir + "/bin")
@@ -166,12 +166,19 @@ var _ = DevPodDescribe("devpod build test suite", func() {
 		_ = f.DevPodProviderDelete(ctx, "kubernetes")
 		err = f.DevPodProviderAdd(ctx, "kubernetes")
 		framework.ExpectNoError(err)
-		err = f.DevPodProviderUse(context.Background(), "kubernetes", "-o", "BUILD_REPOSITORY=test-repo", "-o", "KUBERNETES_NAMESPACE=devpod")
+		err = f.DevPodProviderUse(context.Background(), "kubernetes", "-o", "KUBERNETES_NAMESPACE=devpod")
 		framework.ExpectNoError(err)
 
-		// do the build
-		err = f.DevPodBuild(ctx, tempDir, "--force-build", "--repository", "test-repo", "--skip-push")
+		ginkgo.DeferCleanup(f.DevPodWorkspaceDelete, context.Background(), tempDir)
+
+		// do the up
+		err = f.DevPodUp(ctx, tempDir)
+		framework.ExpectNoError(err)
+
+		// check if ssh works
+		out, err := f.DevPodSSH(ctx, tempDir, "echo -n $MY_TEST")
 		framework.ExpectNoError(err)
+		framework.ExpectEqual(out, "test456", "should contain my-test")
 	})
 })
 

e2e/tests/build/build.go

@@ -1 +1,7 @@
-FROM alpine
+FROM alpine
+
+ENV MY_TEST=test123
+
+FROM ubuntu
+
+ENV MY_TEST=test456

e2e/tests/build/testdata/kubernetes/.devcontainer/Dockerfile

@@ -1,4 +1,6 @@
 {
 	"name": "Build Example Kubernetes",
-	"dockerFile": "Dockerfile"
+	"build": {
+		"dockerfile": "Dockerfile"
+	}
 }

e2e/tests/build/testdata/kubernetes/.devcontainer/devcontainer.json

@@ -160,6 +160,16 @@ func GetAgentWorkspaceContentDir(workspaceDir string) string {
 	return filepath.Join(workspaceDir, "content")
 }
 
+func GetAgentBinariesDirFromWorkspaceDir(workspaceDir string) (string, error) {
+	// check if it already exists
+	_, err := os.Stat(workspaceDir)
+	if err == nil {
+		return filepath.Join(workspaceDir, "binaries"), nil
+	}
+
+	return "", os.ErrNotExist
+}
+
 func GetAgentBinariesDir(agentFolder, context, workspaceID string) (string, error) {
 	homeFolder, err := FindAgentHomeFolder(agentFolder)
 	if err != nil {
@@ -172,13 +182,8 @@ func GetAgentBinariesDir(agentFolder, context, workspaceID string) (string, erro
 	// workspace folder
 	workspaceDir := filepath.Join(homeFolder, "contexts", context, "workspaces", workspaceID)
 
-	// check if it already exists
-	_, err = os.Stat(workspaceDir)
-	if err == nil {
-		return filepath.Join(workspaceDir, "binaries"), nil
-	}
-
-	return "", os.ErrNotExist
+	// get from workspace folder
+	return GetAgentBinariesDirFromWorkspaceDir(workspaceDir)
 }
 
 func GetAgentWorkspaceDir(agentFolder, context, workspaceID string) (string, error) {

pkg/agent/workspace.go

@@ -73,6 +73,7 @@ func (r *Runner) Up(ctx context.Context, options UpOptions) (*config.Result, err
 	_, isDockerDriver := r.Driver.(driver.DockerDriver)
 	if options.Recreate && !isDockerDriver {
 		// TODO: for drivers other than docker and recreate is true, we need to download the complete context here first
+		return nil, fmt.Errorf("rebuilding the workspace is currently not supported for non-docker drivers")
 	}
 
 	// prepare config

pkg/devcontainer/run.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-var dockerlessImage = "dockerless"
+var dockerlessImage = "ghcr.io/loft-sh/dockerless:0.1"
 
 func (r *Runner) runSingleContainer(ctx context.Context, parsedConfig *config.SubstitutedConfig, options UpOptions) (*config.Result, error) {
 	containerDetails, err := r.Driver.FindDevContainer(ctx, r.ID)