You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2024/03/21 08:29:52 UTC
(camel-k) 01/02: fix(#5238): Integration builds fail with arm64 base image
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8dd6138066fc725da42b903a3b3fd2c16d20352f
Author: Thomas Diesler <td...@redhat.com>
AuthorDate: Thu Mar 14 14:37:34 2024 +0100
fix(#5238): Integration builds fail with arm64 base image
---
pkg/builder/jib.go | 1 +
pkg/util/jib/configuration.go | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkg/builder/jib.go b/pkg/builder/jib.go
index 129e978b0..8f39a48f8 100644
--- a/pkg/builder/jib.go
+++ b/pkg/builder/jib.go
@@ -109,6 +109,7 @@ func (t *jibTask) Do(ctx context.Context) v1.BuildStatus {
mavenArgs = append(mavenArgs, "-P", "jib")
mavenArgs = append(mavenArgs, jib.JibMavenToImageParam+t.task.Image)
mavenArgs = append(mavenArgs, jib.JibMavenFromImageParam+baseImage)
+ mavenArgs = append(mavenArgs, jib.JibMavenFromPlatforms+"linux/amd64,linux/arm64")
if t.task.Registry.Insecure {
mavenArgs = append(mavenArgs, jib.JibMavenInsecureRegistries+"true")
}
diff --git a/pkg/util/jib/configuration.go b/pkg/util/jib/configuration.go
index 1fb9bf278..2b483f3cf 100644
--- a/pkg/util/jib/configuration.go
+++ b/pkg/util/jib/configuration.go
@@ -36,9 +36,10 @@ import (
const JibMavenGoal = "jib:build"
const JibMavenToImageParam = "-Djib.to.image="
const JibMavenFromImageParam = "-Djib.from.image="
+const JibMavenFromPlatforms = "-Djib.from.platforms="
const JibMavenInsecureRegistries = "-Djib.allowInsecureRegistries="
const JibDigestFile = "target/jib-image.digest"
-const JibMavenPluginVersionDefault = "3.3.2"
+const JibMavenPluginVersionDefault = "3.4.1"
const JibLayerFilterExtensionMavenVersionDefault = "0.3.0"
// See: https://github.com/GoogleContainerTools/jib/blob/master/jib-maven-plugin/README.md#using-docker-configuration-files
@@ -93,7 +94,7 @@ func CreateProfileConfigmap(ctx context.Context, c client.Client, kit *v1.Integr
return nil
}
-// Create a maven profile defining jib plugin build.
+// JibMavenProfile creates a maven profile defining jib plugin build.
func JibMavenProfile(jibMavenPluginVersion string, jibLayerFilterExtensionMavenVersion string) (string, error) {
jibVersion := JibMavenPluginVersionDefault
if jibMavenPluginVersion != "" {