This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a4494ce3724e02ae33af349094935619c3a4f83f Author: nferraro <ni.ferr...@gmail.com> AuthorDate: Thu Jan 10 17:51:45 2019 +0100 Fix #312: fix logging --- .gitignore | 1 + pkg/builder/kaniko/kaniko.go | 2 +- pkg/builder/s2i/s2i.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e43f829..6361983 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Binary files /camel-k /kamel +/publisher # Released Packages *.tar.gz diff --git a/pkg/builder/kaniko/kaniko.go b/pkg/builder/kaniko/kaniko.go index 75a4cd8..0d80075 100644 --- a/pkg/builder/kaniko/kaniko.go +++ b/pkg/builder/kaniko/kaniko.go @@ -25,7 +25,7 @@ import ( var DefaultSteps = []builder.Step{ builder.NewStep("generate", builder.ProjectGenerationPhase, builder.GenerateProject), builder.NewStep("build/compute-dependencies", builder.ProjectBuildPhase, builder.ComputeDependencies), - builder.NewStep("build/lookup-predefined-dependencies", builder.ProjectBuildPhase + 1, builder.LookupPredefinedImage), + builder.NewStep("lookup/predefined-image", builder.ProjectBuildPhase + 1, builder.LookupPredefinedImage), builder.NewStep("packager", builder.ApplicationPackagePhase, builder.StandardPackager), builder.NewStep("publisher/kaniko", builder.ApplicationPublishPhase, Publisher), builder.NewStep("notify/context", builder.NotifyPhase, builder.NotifyIntegrationContext), diff --git a/pkg/builder/s2i/s2i.go b/pkg/builder/s2i/s2i.go index 8000ea8..9e105a0 100644 --- a/pkg/builder/s2i/s2i.go +++ b/pkg/builder/s2i/s2i.go @@ -25,7 +25,7 @@ import ( var DefaultSteps = []builder.Step{ builder.NewStep("generate", builder.ProjectGenerationPhase, builder.GenerateProject), builder.NewStep("build/compute-dependencies", builder.ProjectBuildPhase, builder.ComputeDependencies), - builder.NewStep("build/lookup-predefined-dependencies", builder.ProjectBuildPhase + 1, builder.LookupPredefinedImage), + builder.NewStep("lookup/predefined-image", builder.ProjectBuildPhase + 1, builder.LookupPredefinedImage), builder.NewStep("packager/incremental", builder.ApplicationPackagePhase, builder.IncrementalPackager), builder.NewStep("publisher/s2i", builder.ApplicationPublishPhase, Publisher), builder.NewStep("notify/context", builder.NotifyPhase, builder.NotifyIntegrationContext),