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 2020/01/22 15:58:59 UTC

[camel-k] 03/13: chore(trait): Default integration container command to 'java'

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 4751f914befe3cc9902b7aed94b7deef8ee702c1
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Jan 17 15:33:06 2020 +0100

    chore(trait): Default integration container command to 'java'
---
 pkg/trait/container.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index 0a3cfa6..02dd117 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -21,14 +21,16 @@ import (
 	"fmt"
 	"strings"
 
-	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
-	"github.com/apache/camel-k/pkg/util/envvar"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/api/batch/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
 	serving "knative.dev/serving/pkg/apis/serving/v1"
+
+	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+	"github.com/apache/camel-k/pkg/util/envvar"
 )
 
 const (
@@ -99,9 +101,10 @@ func (t *containerTrait) Configure(e *Environment) (bool, error) {
 
 func (t *containerTrait) Apply(e *Environment) error {
 	container := corev1.Container{
-		Name:  t.Name,
-		Image: e.Integration.Status.Image,
-		Env:   make([]corev1.EnvVar, 0),
+		Name:    t.Name,
+		Image:   e.Integration.Status.Image,
+		Env:     make([]corev1.EnvVar, 0),
+		Command: []string{"java"},
 	}
 
 	// combine Environment of integration with platform, kit, integration