You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2019/12/18 12:34:57 UTC
[camel-k] 12/13: fix(build): Fix incremental build
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b27aa1471c57da5b2c91c4a739264702f1f5303c
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue Dec 17 18:55:31 2019 +0100
fix(build): Fix incremental build
---
pkg/apis/camel/v1alpha1/build_types.go | 1 +
pkg/builder/builder.go | 8 ++++++--
pkg/builder/builder_steps.go | 1 -
pkg/builder/builder_types.go | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/build_types.go b/pkg/apis/camel/v1alpha1/build_types.go
index e694b92..b721036 100644
--- a/pkg/apis/camel/v1alpha1/build_types.go
+++ b/pkg/apis/camel/v1alpha1/build_types.go
@@ -63,6 +63,7 @@ type KanikoTask struct {
type BuilderTask struct {
BaseTask `json:",inline"`
Meta metav1.ObjectMeta `json:"meta,omitempty"`
+ Image string `json:"image,omitempty"`
BaseImage string `json:"baseImage,omitempty"`
CamelVersion string `json:"camelVersion,omitempty"`
RuntimeVersion string `json:"runtimeVersion,omitempty"`
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index c54b860..b98173a 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -74,6 +74,10 @@ func (b *defaultBuilder) Run(build v1alpha1.BuilderTask) v1alpha1.BuildStatus {
BaseImage: build.BaseImage,
}
+ if build.Image != "" {
+ c.BaseImage = build.Image
+ }
+
// base image is mandatory
if c.BaseImage == "" {
result.Phase = v1alpha1.BuildPhaseFailed
@@ -166,8 +170,8 @@ func (b *defaultBuilder) Run(build v1alpha1.BuilderTask) v1alpha1.BuildStatus {
b.log.Infof("dependencies: %s", build.Dependencies)
b.log.Infof("artifacts: %s", artifactIDs(c.Artifacts))
b.log.Infof("artifacts selected: %s", artifactIDs(c.SelectedArtifacts))
- b.log.Infof("requested image: %s", build.BaseImage)
- b.log.Infof("base image: %s", c.BaseImage)
+ b.log.Infof("base image: %s", build.BaseImage)
+ b.log.Infof("resolved base image: %s", c.BaseImage)
b.log.Infof("resolved image: %s", c.Image)
} else {
b.log.Infof("build task %s interrupted", build.Name)
diff --git a/pkg/builder/builder_steps.go b/pkg/builder/builder_steps.go
index b5e9f1a..fdee0f9 100644
--- a/pkg/builder/builder_steps.go
+++ b/pkg/builder/builder_steps.go
@@ -297,7 +297,6 @@ func incrementalPackager(ctx *Context) error {
}
ctx.BaseImage = bestImage.Image
- //ctx.Image = bestImage.Image
ctx.SelectedArtifacts = selectedArtifacts
}
diff --git a/pkg/builder/builder_types.go b/pkg/builder/builder_types.go
index 52e6462..a497d79 100644
--- a/pkg/builder/builder_types.go
+++ b/pkg/builder/builder_types.go
@@ -120,7 +120,7 @@ type Context struct {
// HasRequiredImage --
func (c *Context) HasRequiredImage() bool {
- return c.Build.BaseImage != ""
+ return c.Build.Image != ""
}
type publishedImage struct {