add support for pre run command and custom build dir for CompileDaemon (

#83)
moshebe · Jan 19, 2021 · eba60a8 · eba60a8
1 parent 6918859
commit eba60a8
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 4 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -19,7 +19,9 @@ var AppFs = afero.NewOsFs()
 type Config struct {
 	Name             string   `yaml:"name" json:"name"`
 	OutputBinaryPath string   `yaml:"output_binary" json:"outputBinary"`
+	PreRunCommands   []string `yaml:"pre_run_commands,omitempty" json:"preRunCommands"`
 	BuildCommand     string   `yaml:"build_command" json:"buildCommand"`
+	BuildDir         string   `yaml:"build_dir" json:"buildDir"`
 	RunCommand       string   `yaml:"run_command" json:"runCommand"`
 	RuntimeImage     string   `yaml:"runtime_image" json:"runtimeImage"`
 	DebuggerEnabled  bool     `yaml:"debugger_enabled" json:"debuggerEnabled"`

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -121,6 +121,7 @@ func TestConfig_Write(t *testing.T) {
 				Name:             "my-app",
 				OutputBinaryPath: "/app",
 				BuildCommand:     "go build -o /app -gcflags=\"all=-N-l\"",
+				BuildDir:         "/app",
 				RunCommand:       "/app",
 				RuntimeImage:     "golang:1.15.2",
 				DebuggerPort:     40000,
@@ -130,6 +131,7 @@ func TestConfig_Write(t *testing.T) {
 			expected: `name: my-app
 output_binary: /app
 build_command: go build -o /app -gcflags="all=-N-l"
+build_dir: /app
 run_command: /app
 runtime_image: golang:1.15.2
 debugger_enabled: true

diff --git a/pkg/config/render.go b/pkg/config/render.go
@@ -73,13 +73,15 @@ func (c *Config) RenderDockerfile(writer io.Writer) error {
 RUN go get github.com/githubnemo/CompileDaemon
 RUN go get github.com/go-delve/delve/cmd/dlv
 
+{{- if .PreRunCommands}}{{range .PreRunCommands}}
+RUN {{.}}{{end}}{{end}}
 WORKDIR /src
 COPY . .
 
 {{if .DebuggerEnabled -}}
 RUN {{.BuildCommand}}
 ENTRYPOINT dlv --listen=:{{.DebuggerPort}} --headless=true --api-version=2 --accept-multiclient exec {{.OutputBinaryPath}}
 {{- else -}}
-ENTRYPOINT CompileDaemon -log-prefix=false -build="{{.BuildCommand}}" -command="{{.RunCommand}}"
+ENTRYPOINT CompileDaemon -log-prefix=false -build="{{.BuildCommand}}"{{if .BuildDir }} -build-dir="{{.BuildDir}}"{{ end}} -command="{{.RunCommand}}"
 {{- end}}`, writer)
 }
diff --git a/pkg/config/render_test.go b/pkg/config/render_test.go
@@ -70,7 +70,6 @@ func TestConfig_RenderDockerfile(t *testing.T) {
 		`FROM golang:1.15.2
 RUN go get github.com/githubnemo/CompileDaemon
 RUN go get github.com/go-delve/delve/cmd/dlv
-
 WORKDIR /src
 COPY . .
 

diff --git a/pkg/config/testdata/generate_dockerfile_0.golden b/pkg/config/testdata/generate_dockerfile_0.golden
@@ -1,7 +1,6 @@
 FROM golang:1.15.2
 RUN go get github.com/githubnemo/CompileDaemon
 RUN go get github.com/go-delve/delve/cmd/dlv
-
 WORKDIR /src
 COPY . .
 

diff --git a/pkg/config/testdata/generate_dockerfile_1.golden b/pkg/config/testdata/generate_dockerfile_1.golden
@@ -1,7 +1,6 @@
 FROM golang:1.15.2
 RUN go get github.com/githubnemo/CompileDaemon
 RUN go get github.com/go-delve/delve/cmd/dlv
-
 WORKDIR /src
 COPY . .
 

diff --git a/pkg/config/testdata/generate_dockerfile_2.golden b/pkg/config/testdata/generate_dockerfile_2.golden
@@ -0,0 +1,7 @@
+FROM golang:1.15.2
+RUN go get github.com/githubnemo/CompileDaemon
+RUN go get github.com/go-delve/delve/cmd/dlv
+WORKDIR /src
+COPY . .
+
+ENTRYPOINT CompileDaemon -log-prefix=false -build="go build -o /app" -build-dir="/src" -command="/app"
diff --git a/pkg/config/testdata/generate_dockerfile_2.in b/pkg/config/testdata/generate_dockerfile_2.in
@@ -0,0 +1,10 @@
+name: my-app
+output_binary: /app
+build_command: go build -o {{.output_binary}}
+build_dir: /src
+runtime_image: golang:1.15.2
+run_command: '{{.output_binary}}'
+debugger_port: 40000
+debugger_enabled: false
+expose_ports:
+  - 8080
diff --git a/pkg/config/testdata/generate_dockerfile_3.golden b/pkg/config/testdata/generate_dockerfile_3.golden
@@ -0,0 +1,9 @@
+FROM golang:1.15.2
+RUN go get github.com/githubnemo/CompileDaemon
+RUN go get github.com/go-delve/delve/cmd/dlv
+RUN echo "hello" && echo "world"
+RUN ls
+WORKDIR /src
+COPY . .
+
+ENTRYPOINT CompileDaemon -log-prefix=false -build="go build -o /app" -build-dir="/src" -command="/app"
diff --git a/pkg/config/testdata/generate_dockerfile_3.in b/pkg/config/testdata/generate_dockerfile_3.in
@@ -0,0 +1,13 @@
+name: my-app
+output_binary: /app
+pre_run_commands:
+  - echo "hello" && echo "world"
+  - ls
+build_command: go build -o {{.output_binary}}
+build_dir: /src
+runtime_image: golang:1.15.2
+run_command: '{{.output_binary}}'
+debugger_port: 40000
+debugger_enabled: false
+expose_ports:
+  - 8080