This is an automated email from the ASF dual-hosted git repository. mgubaidullin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit d6f7b0da5302ac99198f854b3b110aee21c2ed5e Author: Marat Gubaidullin <[email protected]> AuthorDate: Tue Sep 29 17:03:47 2026 -0400 Fixes for Karavan 4.22.1 --- .../src/main/resources/configuration/docker/build.sh | 10 +++++++--- .../src/main/resources/configuration/kubernetes/build.sh | 15 +++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/karavan-app/src/main/resources/configuration/docker/build.sh b/karavan-app/src/main/resources/configuration/docker/build.sh index 1134fd1e..1a7339d0 100644 --- a/karavan-app/src/main/resources/configuration/docker/build.sh +++ b/karavan-app/src/main/resources/configuration/docker/build.sh @@ -8,10 +8,11 @@ git clone --filter=blob:none --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CODE_DIR log_step "⚙️ Configuring Environment" JIB_MAVEN_VERSION=3.5.2 JIB_ARGS=( + "-Djib.containerizingMode=exploded" "-Djib.allowInsecureRegistries=true" "-Djib.from.image=registry.access.redhat.com/hi/openjdk:21.0.11" "-Djib.container.creationTime=USE_CURRENT_TIMESTAMP" - "-Djib.container.labels=org.apache.camel.karavan/type=packaged,org.apache.camel.karavan/projectId=$PROJECT_ID" + "-Djib.container.labels=org.apache.camel.karavan/type=packaged,org.apache.camel.karavan/projectId=$PROJECT_ID,org.opencontainers.image.revision=$GIT_COMMIT" "-Djib.to.image=$IMAGE_REGISTRY/$IMAGE_GROUP/$PROJECT_ID:$TAG" "-Djib.to.auth.username=$IMAGE_REGISTRY_USERNAME" "-Djib.to.auth.password=$IMAGE_REGISTRY_PASSWORD" @@ -24,7 +25,10 @@ log_step "📦 Exporting project into Maven" # TODO: --ignore-loading-error until https://issues.apache.org/jira/browse/CAMEL-24410 java -cp "$KARAVAN_LIB/*" KaravanDevMode export * --local-kamelet-dir=$KAMELETS_DIR --dir=.export --ignore-loading-error -log_step "🛠️ Build " -mvn package "com.google.cloud.tools:jib-maven-plugin:${JIB_MAVEN_VERSION}:build" -f .export "${JIB_ARGS[@]}" --no-transfer-progress +log_step "🛠️ Maven Compile" +mvn compile -f .export --no-transfer-progress + +log_step "🚀 Push Image" +mvn "com.google.cloud.tools:jib-maven-plugin:${JIB_MAVEN_VERSION}:build" -f .export "${JIB_ARGS[@]}" --no-transfer-progress log_step "✅ Process Complete" \ No newline at end of file diff --git a/karavan-app/src/main/resources/configuration/kubernetes/build.sh b/karavan-app/src/main/resources/configuration/kubernetes/build.sh index c8cfa847..46c68bd4 100644 --- a/karavan-app/src/main/resources/configuration/kubernetes/build.sh +++ b/karavan-app/src/main/resources/configuration/kubernetes/build.sh @@ -8,11 +8,12 @@ git clone --filter=blob:none --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CODE_DIR log_step "⚙️ Configuring Environment" JIB_MAVEN_VERSION=3.5.2 JIB_ARGS=( + "-Djib.containerizingMode=exploded" "-Djib.allowInsecureRegistries=true" "-Djib.from.image=registry.access.redhat.com/hi/openjdk:21.0.11" "-Djib.container.creationTime=USE_CURRENT_TIMESTAMP" - "-Djib.container.labels=org.apache.camel.karavan/type=packaged,org.apache.camel.karavan/projectId=$PROJECT_ID" - "-Djib.to.image=$IMAGE_REGISTRY/$IMAGE_GROUP/$PROJECT_ID:$TAG" + "-Djib.container.labels=org.apache.camel.karavan/type=packaged,org.apache.camel.karavan/projectId=$PROJECT_ID,org.opencontainers.image.revision=$GIT_COMMIT" + "-Djib.to.image=$IMAGE_REGISTRY/$IMAGE_GROUP/$PROJECT_ID:$TAG" "-Djib.to.auth.username=$IMAGE_REGISTRY_USERNAME" "-Djib.to.auth.password=$IMAGE_REGISTRY_PASSWORD" ) @@ -39,7 +40,13 @@ log_step "📦 Exporting project into Maven" # TODO: --ignore-loading-error until https://issues.apache.org/jira/browse/CAMEL-24410 java -cp "$KARAVAN_LIB/*" KaravanDevMode export * --local-kamelet-dir=$KAMELETS_DIR --dir=.export --ignore-loading-error -log_step "🛠️ Build and Deploy" -mvn package "com.google.cloud.tools:jib-maven-plugin:${JIB_MAVEN_VERSION}:build" $JKUBE_GOAL -f .export "${JIB_ARGS[@]}" --no-transfer-progress +log_step "🛠️ Maven Compile" +mvn compile -f .export --no-transfer-progress + +log_step "🚀 Push Image" +mvn "com.google.cloud.tools:jib-maven-plugin:${JIB_MAVEN_VERSION}:build" -f .export "${JIB_ARGS[@]}" --no-transfer-progress + +log_step "🛠️ Deploy" +mvn $JKUBE_GOAL -f .export "${JIB_ARGS[@]}" --no-transfer-progress log_step "✅ Process Complete" \ No newline at end of file
