feat(run): Use CompileDaemon for golang

asalkeld · asalkeld · commit b1eb917a74d9 · 2022-02-04T11:33:28.000+10:00
diff --git a/pkg/containerengine/types.go b/pkg/containerengine/types.go
@@ -19,6 +19,7 @@ package containerengine
 import (
 	"errors"
 	"io"
+	"strings"
 	"time"
 
 	"github.com/docker/docker/api/types"
@@ -80,3 +81,51 @@ func Discover() (ContainerEngine, error) {
 func buildTimeout() time.Duration {
 	return viper.GetDuration("build_timeout")
 }
+
+func Cli(cc *container.Config, hc *container.HostConfig) string {
+	cmd := []string{"docker", "run"}
+
+	if cc.Tty {
+		cmd = append(cmd, "-t")
+	}
+
+	if len(cc.Entrypoint) > 0 {
+		cmd = append(cmd, "--entrypoint")
+		cmd = append(cmd, cc.Entrypoint...)
+	}
+
+	if cc.WorkingDir != "" {
+		cmd = append(cmd, "-w", cc.WorkingDir)
+	}
+
+	for _, v := range hc.Mounts {
+		cmd = append(cmd, "-v", v.Source+":"+v.Target)
+	}
+
+	for _, e := range cc.Env {
+		cmd = append(cmd, "-e", e)
+	}
+
+	for _, h := range hc.ExtraHosts {
+		cmd = append(cmd, "--add-host", h)
+	}
+
+	if hc.AutoRemove {
+		cmd = append(cmd, "--rm")
+	}
+
+	if cc.AttachStdout {
+		cmd = append(cmd, "-a", "stdout")
+	}
+	if cc.AttachStdin {
+		cmd = append(cmd, "-a", "stdin")
+	}
+	if cc.AttachStderr {
+		cmd = append(cmd, "-a", "stderr")
+	}
+
+	cmd = append(cmd, cc.Image)
+	cmd = append(cmd, cc.Cmd...)
+
+	return strings.Join(cmd, " ")
+}
diff --git a/pkg/run/function.go b/pkg/run/function.go
@@ -17,12 +17,14 @@ package run
 
 import (
 	"fmt"
+	"log"
 	goruntime "runtime"
 	"time"
 
 	"github.com/docker/docker/api/types/container"
 
 	"github.com/nitrictech/newcli/pkg/containerengine"
+	"github.com/nitrictech/newcli/pkg/output"
 	"github.com/nitrictech/newcli/pkg/runtime"
 	"github.com/nitrictech/newcli/pkg/stack"
 )
@@ -46,18 +48,19 @@ func (f *Function) Start() error {
 		return err
 	}
 
-	hostConfig := &container.HostConfig{
+	hc := &container.HostConfig{
 		AutoRemove: true,
 		Mounts:     launchOpts.Mounts,
 		LogConfig:  *f.ce.Logger(f.runCtx).Config(),
 	}
+
 	if goruntime.GOOS == "linux" {
 		// setup host.docker.internal to route to host gateway
 		// to access rpc server hosted by local CLI run
-		hostConfig.ExtraHosts = []string{"host.docker.internal:172.17.0.1"}
+		hc.ExtraHosts = []string{"host.docker.internal:172.17.0.1"}
 	}
 
-	cID, err := f.ce.ContainerCreate(&container.Config{
+	cc := &container.Config{
 		Image: f.rt.DevImageName(), // Select an image to use based on the handler
 		// Set the address to the bound port
 		Env: []string{
@@ -68,7 +71,13 @@ func (f *Function) Start() error {
 		Entrypoint: launchOpts.Entrypoint,
 		Cmd:        launchOpts.Cmd,
 		WorkingDir: launchOpts.TargetWD,
-	}, hostConfig, nil, f.Name())
+	}
+
+	if output.VerboseLevel > 1 {
+		log.Default().Print(containerengine.Cli(cc, hc))
+	}
+
+	cID, err := f.ce.ContainerCreate(cc, hc, nil, f.Name())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/run/minio.go b/pkg/run/minio.go
@@ -17,6 +17,7 @@ package run
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"time"
@@ -29,6 +30,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/nitrictech/newcli/pkg/containerengine"
+	"github.com/nitrictech/newcli/pkg/output"
 )
 
 type MinioServer struct {
@@ -80,14 +82,16 @@ func (m *MinioServer) Start() error {
 		return err
 	}
 
-	cID, err := m.ce.ContainerCreate(&container.Config{
+	cc := &container.Config{
 		Image: minioImage,
 		Cmd:   []string{"minio", "server", "/nitric/buckets", "--console-address", fmt.Sprintf(":%d", consolePort)},
 		ExposedPorts: nat.PortSet{
 			nat.Port(fmt.Sprintf("%d/tcp", minioPort)):        struct{}{},
 			nat.Port(fmt.Sprintf("%d/tcp", minioConsolePort)): struct{}{},
 		},
-	}, &container.HostConfig{
+	}
+
+	hc := &container.HostConfig{
 		AutoRemove: true,
 		PortBindings: nat.PortMap{
 			nat.Port(fmt.Sprintf("%d/tcp", minioPort)): []nat.PortBinding{
@@ -110,15 +114,19 @@ func (m *MinioServer) Start() error {
 		},
 		LogConfig:   *m.ce.Logger(m.dir).Config(),
 		NetworkMode: container.NetworkMode("bridge"),
-	}, &network.NetworkingConfig{
-		EndpointsConfig: map[string]*network.EndpointSettings{},
-	}, "minio-"+m.name)
+	}
+
+	cID, err := m.ce.ContainerCreate(cc, hc, &network.NetworkingConfig{EndpointsConfig: map[string]*network.EndpointSettings{}}, "minio-"+m.name)
 	if err != nil {
 		return err
 	}
 	m.cid = cID
 	m.apiPort = minioPort
 
+	if output.VerboseLevel > 1 {
+		log.Default().Print(containerengine.Cli(cc, hc))
+	}
+
 	return m.ce.Start(cID)
 }
 
diff --git a/pkg/runtime/golang.go b/pkg/runtime/golang.go
@@ -112,6 +112,7 @@ func (t *golang) FunctionDockerfileForCodeAsConfig(w io.Writer) error {
 	if err != nil {
 		return err
 	}
+	con.Run(dockerfile.RunOptions{Command: []string{"go", "get", "github.com/asalkeld/CompileDaemon@d4b10de"}})
 
 	_, err = w.Write([]byte(strings.Join(con.Lines(), "\n")))
 	return err
@@ -123,10 +124,9 @@ func (t *golang) LaunchOptsForFunctionCollect(runCtx string) (LaunchOpts, error)
 		return LaunchOpts{}, err
 	}
 	return LaunchOpts{
-		Image:      t.DevImageName(),
-		TargetWD:   path.Join("/go/src", module),
-		Entrypoint: strslice.StrSlice{"go", "run"},
-		Cmd:        strslice.StrSlice{"./" + t.handler},
+		Image:    t.DevImageName(),
+		TargetWD: path.Join("/go/src", module),
+		Cmd:      strslice.StrSlice{"go", "run", "./" + t.handler},
 		Mounts: []mount.Mount{
 			{
 				Type:   "bind",
@@ -147,10 +147,26 @@ func (t *golang) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
 	if err != nil {
 		return LaunchOpts{}, err
 	}
-	return LaunchOpts{
-		TargetWD:   path.Join("/go/src", module),
-		Entrypoint: strslice.StrSlice{"go", "run"},
-		Cmd:        strslice.StrSlice{"./" + t.handler},
+	containerRunCtx := path.Join("/go/src", module)
+	relHandler := t.handler
+	if strings.HasPrefix(t.handler, runCtx) {
+		relHandler, err = filepath.Rel(runCtx, t.handler)
+		if err != nil {
+			return LaunchOpts{}, err
+		}
+	}
+
+	opts := LaunchOpts{
+		TargetWD: containerRunCtx,
+		Cmd: strslice.StrSlice{
+			"/go/bin/CompileDaemon",
+			"-verbose",
+			"-exclude-dir=.git",
+			"-exclude-dir=.nitric",
+			"-directory=.",
+			fmt.Sprintf("-build=go build -o %s ./%s", t.ContainerName(), relHandler),
+			"-command=./" + t.ContainerName(),
+		},
 		Mounts: []mount.Mount{
 			{
 				Type:   "bind",
@@ -160,8 +176,10 @@ func (t *golang) LaunchOptsForFunction(runCtx string) (LaunchOpts, error) {
 			{
 				Type:   "bind",
 				Source: runCtx,
-				Target: path.Join("/go/src", module),
+				Target: containerRunCtx,
 			},
 		},
-	}, nil
+	}
+
+	return opts, nil
 }
