Adds working bind mount

cmoog · cmoog · commit 025e1bdfc1e5 · 2020-07-28T10:00:36.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 ci/bin
 cmd/coder/coder
+ci/integration/bin
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -2,7 +2,10 @@ package integration
 
 import (
 	"context"
+	"fmt"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -11,12 +14,33 @@ import (
 	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
+func build(t *testing.T, path string) {
+	cmd := exec.Command(
+		"sh", "-c",
+		fmt.Sprintf("cd ../../ && go build -o %s ./cmd/coder", path),
+	)
+	cmd.Env = append(os.Environ(), "GOOS=linux", "CGO_ENABLED=0")
+
+	out, err := cmd.CombinedOutput()
+	t.Logf("%s", string(out))
+	assert.Success(t, "build go binary", err)
+}
+
 func TestTCli(t *testing.T) {
 	ctx := context.Background()
 
+	cwd, err := os.Getwd()
+	assert.Success(t, "get working dir", err)
+
+	binpath := filepath.Join(cwd, "bin", "coder")
+	build(t, binpath)
+
 	container, err := tcli.NewRunContainer(ctx, &tcli.ContainerConfig{
 		Image: "ubuntu:latest",
 		Name:  "test-container",
+		BindMounts: map[string]string{
+			binpath: "/bin/coder",
+		},
 	})
 
 	assert.Success(t, "new run container", err)
@@ -43,4 +67,10 @@ func TestTCli(t *testing.T) {
 		tcli.StderrEmpty(),
 		tcli.StdoutMatches("testing"),
 	)
+
+	container.Run(ctx, "which coder").Assert(t,
+		tcli.Success(),
+		tcli.StdoutMatches("/bin/coder"),
+		tcli.StderrEmpty(),
+	)
 }
diff --git a/ci/tcli/tcli.go b/ci/tcli/tcli.go
@@ -20,14 +20,14 @@ type RunContainer struct {
 }
 
 type ContainerConfig struct {
-	Name   string
-	Image  string
-	Mounts map[string]string
+	Name       string
+	Image      string
+	BindMounts map[string]string
 }
 
 func mountArgs(m map[string]string) (args []string) {
 	for src, dest := range m {
-		args = append(args, "--mount", fmt.Sprintf("source=%s,target=%s", src, dest))
+		args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s", src, dest))
 	}
 	return args
 }
@@ -50,7 +50,7 @@ func NewRunContainer(ctx context.Context, config *ContainerConfig) (*RunContaine
 		"--name", config.Name,
 		"-it", "-d",
 	}
-	args = append(args, mountArgs(config.Mounts)...)
+	args = append(args, mountArgs(config.BindMounts)...)
 	args = append(args, config.Image)
 
 	cmd := exec.CommandContext(ctx, "docker", args...)

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .idea
 ci/bin
 cmd/coder/coder
 +ci/integration/bin
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@ type RunContainer struct {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`type ContainerConfig struct {`
`23`		`- Name string`
`24`		`- Image string`
`25`		`- Mounts map[string]string`
	`23`	`+ Name string`
	`24`	`+ Image string`
	`25`	`+ BindMounts map[string]string`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func mountArgs(m map[string]string) (args []string) {`
`29`	`29`	`for src, dest := range m {`
`30`		`- args = append(args, "--mount", fmt.Sprintf("source=%s,target=%s", src, dest))`
	`30`	`+ args = append(args, "--mount", fmt.Sprintf("type=bind,source=%s,target=%s", src, dest))`
`31`	`31`	`}`
`32`	`32`	`return args`
`33`	`33`	`}`
`@@ -50,7 +50,7 @@ func NewRunContainer(ctx context.Context, config ContainerConfig) (RunContaine`
`50`	`50`	`"--name", config.Name,`
`51`	`51`	`"-it", "-d",`
`52`	`52`	`}`
`53`		`- args = append(args, mountArgs(config.Mounts)...)`
	`53`	`+ args = append(args, mountArgs(config.BindMounts)...)`
`54`	`54`	`args = append(args, config.Image)`
`55`	`55`
`56`	`56`	`cmd := exec.CommandContext(ctx, "docker", args...)`