[camel-k] 01/02: Fix #226: set correct build dir for Kaniko

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 0064989b9360898aab22fadd84cb9210d9852dac
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Nov 16 14:05:17 2018 +0100

    Fix #226: set correct build dir for Kaniko
---
 pkg/builder/builder.go       | 6 +++++-
 pkg/builder/builder_types.go | 1 +
 pkg/builder/kaniko/kaniko.go | 3 +++
 pkg/platform/build.go        | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index 1b452b4..430933b 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -124,7 +124,11 @@ func (b *defaultBuilder) submit(request Request) {
 	r.Task.StartedAt = time.Now()
 
 	// create tmp path
-	builderPath, err := ioutil.TempDir(os.TempDir(), "builder-")
+	buildDir := request.BuildDir
+	if buildDir == "" {
+		buildDir = os.TempDir()
+	}
+	builderPath, err := ioutil.TempDir(buildDir, "builder-")
 	if err != nil {
 		r.Status = StatusError
 		r.Error = err
diff --git a/pkg/builder/builder_types.go b/pkg/builder/builder_types.go
index f4cd9b8..6b97c1e 100644
--- a/pkg/builder/builder_types.go
+++ b/pkg/builder/builder_types.go
@@ -85,6 +85,7 @@ type Request struct {
 	Code         v1alpha1.SourceSpec
 	Dependencies []string
 	Steps        []Step
+	BuildDir     string
 }
 
 // Task --
diff --git a/pkg/builder/kaniko/kaniko.go b/pkg/builder/kaniko/kaniko.go
index 318958f..4cf6754 100644
--- a/pkg/builder/kaniko/kaniko.go
+++ b/pkg/builder/kaniko/kaniko.go
@@ -28,3 +28,6 @@ var DefaultSteps = []builder.Step{
 	builder.NewStep("packager", 30, builder.StandardPackager),
 	builder.NewStep("publisher", 40, Publisher),
 }
+
+// BuildDir is the directory where to build artifacts (shared with the Kaniko pod)
+var BuildDir = "/workspace"
\ No newline at end of file
diff --git a/pkg/platform/build.go b/pkg/platform/build.go
index 7b6332a..d0a8c0e 100644
--- a/pkg/platform/build.go
+++ b/pkg/platform/build.go
@@ -64,6 +64,7 @@ func NewBuildRequest(ctx context.Context, context *v1alpha1.IntegrationContext)
 		req.Steps = s2i.DefaultSteps
 	} else if SupportsKanikoPublishStrategy(p) {
 		req.Steps = kaniko.DefaultSteps
+		req.BuildDir = kaniko.BuildDir
 	} else {
 		return req, errors.New("unsupported platform configuration")
 	}