From fd7a3e28cae026e8e9743efd1d9f79030a26e5e8 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 19 Apr 2022 10:52:43 -0500 Subject: [PATCH 1/2] feat: add competitive advanced git functionality --- cmd/coder/main.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/cmd/coder/main.go b/cmd/coder/main.go index df91af57afcc3..47cb46d2c8562 100644 --- a/cmd/coder/main.go +++ b/cmd/coder/main.go @@ -4,12 +4,16 @@ import ( "errors" "fmt" "os" + "os/exec" + "path/filepath" + "strings" "github.com/coder/coder/cli" "github.com/coder/coder/cli/cliui" ) func main() { + dadjoke() err := cli.Root().Execute() if err != nil { if errors.Is(err, cliui.Canceled) { @@ -19,3 +23,24 @@ func main() { os.Exit(1) } } + +//nolint +func dadjoke() { + if os.Getenv("EEOFF") != "" || filepath.Base(os.Args[0]) != "gitpod" { + return + } + + fmt.Println("i am gitpod lol") + args := strings.Fields(`run -it --rm git --image=index.docker.io/bitnami/git --command --restart=Never -- git`) + args = append(args, os.Args[1:]...) + cmd := exec.Command("kubectl", args...) + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + _ = cmd.Start() + err := cmd.Wait() + if exitErr, ok := err.(*exec.ExitError); ok { + os.Exit(exitErr.ExitCode()) + } + os.Exit(0) +} From 421374016fb8b0eeedaffaccc1bfdc67bcdfc92a Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 19 Apr 2022 11:45:20 -0500 Subject: [PATCH 2/2] fixup! feat: add competitive advanced git functionality --- cmd/coder/main.go | 1 - examples/docker-local/main.tf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/coder/main.go b/cmd/coder/main.go index 47cb46d2c8562..1c09c6985185b 100644 --- a/cmd/coder/main.go +++ b/cmd/coder/main.go @@ -30,7 +30,6 @@ func dadjoke() { return } - fmt.Println("i am gitpod lol") args := strings.Fields(`run -it --rm git --image=index.docker.io/bitnami/git --command --restart=Never -- git`) args = append(args, os.Args[1:]...) cmd := exec.Command("kubectl", args...) diff --git a/examples/docker-local/main.tf b/examples/docker-local/main.tf index e17fb84d08c59..912e903e11116 100644 --- a/examples/docker-local/main.tf +++ b/examples/docker-local/main.tf @@ -37,7 +37,7 @@ resource "docker_volume" "coder_volume" { } resource "docker_container" "workspace" { - count = data.coder_workspace.me.start_count + count = data.coder_workspace.me.start_count image = var.docker_image name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root" dns = ["1.1.1.1"]