[camel-k] branch master updated: Fix Kaniko build dir

[nferraro]

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


The following commit(s) were added to refs/heads/master by this push:
     new f149941  Fix Kaniko build dir
f149941 is described below

commit f1499417cc6697da53f09a3537d298b5fc7a5bfe
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Mon Dec 10 01:44:36 2018 +0100

    Fix Kaniko build dir
---
 pkg/stub/action/context/build.go           | 1 +
 pkg/stub/action/integration/build_image.go | 1 +
 pkg/trait/builder.go                       | 2 ++
 pkg/trait/types.go                         | 1 +
 4 files changed, 5 insertions(+)

diff --git a/pkg/stub/action/context/build.go b/pkg/stub/action/context/build.go
index 35901fe..e36fc71 100644
--- a/pkg/stub/action/context/build.go
+++ b/pkg/stub/action/context/build.go
@@ -66,6 +66,7 @@ func (action *buildAction) Handle(context 
*v1alpha1.IntegrationContext) error {
                Dependencies: context.Spec.Dependencies,
                Repositories: context.Spec.Repositories,
                Steps:        env.Steps,
+               BuildDir:     env.BuildDir,
                Platform:     env.Platform.Spec,
        }
 
diff --git a/pkg/stub/action/integration/build_image.go 
b/pkg/stub/action/integration/build_image.go
index d205ebc..fdc76d8 100644
--- a/pkg/stub/action/integration/build_image.go
+++ b/pkg/stub/action/integration/build_image.go
@@ -87,6 +87,7 @@ func (action *buildImageAction) Handle(integration 
*v1alpha1.Integration) error
        r := builder.Request{
                Meta:     integration.ObjectMeta,
                Steps:    env.Steps,
+               BuildDir: env.BuildDir,
                Platform: env.Platform.Spec,
                Image:    ctx.Status.Image,
        }
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 545067e..2132a1b 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -55,6 +55,7 @@ func (*builderTrait) apply(e *Environment) error {
                        e.Steps = s2i.DefaultSteps
                } else if platform.SupportsKanikoPublishStrategy(e.Platform) {
                        e.Steps = kaniko.DefaultSteps
+                       e.BuildDir = kaniko.BuildDir
                }
        }
 
@@ -73,6 +74,7 @@ func (*builderTrait) apply(e *Environment) error {
                                builder.NewStep("publisher/kaniko", 
builder.ApplicationPublishPhase, kaniko.Publisher),
                                builder.NewStep("notify/integration", 
builder.NotifyPhase, builder.NotifyIntegration),
                        }
+                       e.BuildDir = kaniko.BuildDir
                }
        }
 
diff --git a/pkg/trait/types.go b/pkg/trait/types.go
index 53fb69c..d61f352 100644
--- a/pkg/trait/types.go
+++ b/pkg/trait/types.go
@@ -96,6 +96,7 @@ type Environment struct {
        Integration    *v1alpha1.Integration
        Resources      *kubernetes.Collection
        Steps          []builder.Step
+       BuildDir       string
        ExecutedTraits []ID
        EnvVars        map[string]string
 }