[camel-karavan] branch main updated: Prepare to work in Openshift for #885

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new ffaff469 Prepare to work in Openshift for #885
ffaff469 is described below

commit ffaff469ccd3c422d4825a3c177db29f7a89b9c1
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Sun Sep 17 12:32:54 2023 -0400

    Prepare to work in Openshift for #885
---
 karavan-web/docker/Dockerfile.devmode                                  | 1 +
 karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/karavan-web/docker/Dockerfile.devmode 
b/karavan-web/docker/Dockerfile.devmode
index 2e8ddcbf..ebed8e4f 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -33,6 +33,7 @@ RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
     && jbang app install camel@apache/camel \
     && jbang config set cache-evict never
 
+git config --global --add safe.directory $CODE
 EXPOSE 8080
 WORKDIR $CODE
 CMD jbang $JBANG_OPTIONS -Dcamel.jbang.version=$CAMEL_VERSION 
camel@apache/camel run --source-dir=$CODE_DIR --console 
--local-kamelet-dir=$KAMELETS_DIR
\ No newline at end of file
diff --git 
a/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh 
b/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
index 517158d4..f8edb112 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
+++ b/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
@@ -25,7 +25,7 @@ export DATE=${TAG}
 export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
 export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
 
-mvn package jib:build oc:resource oc:apply \
+mvn package jib:build org.eclipse.jkube:openshift-maven-plugin:1.14.0:resource 
org.eclipse.jkube:openshift-maven-plugin:1.14.0:apply \
   -Djkube.namespace=${NAMESPACE} \
   -Djib.allowInsecureRegistries=true \
   -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${DATE} \