[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 718d36ea Prepare to work in Openshift for #885
718d36ea is described below

commit 718d36ea67a880bf318faf62ff5a1011359f2a5e
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Sat Sep 16 19:08:41 2023 -0400

    Prepare to work in Openshift for #885
---
 karavan-web/docker/Dockerfile.devmode                             | 7 ++++---
 .../org/apache/camel/karavan/kubernetes/KubernetesService.java    | 8 ++------
 .../java/org/apache/camel/karavan/service/ProjectService.java     | 1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/karavan-web/docker/Dockerfile.devmode 
b/karavan-web/docker/Dockerfile.devmode
index 20c8e2e4..2565785a 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -26,13 +26,14 @@ RUN mkdir -p $DOT_CAMEL \
     && mkdir -p $BUILDER_PATH \
     && mkdir -p $JBANG_REPO
 
-RUN chgrp -R 0 $KARAVAN && chmod -R g+rwX $KARAVAN
-
 RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
     && jbang trust add  --quiet  https://github.com/apache/camel \
     && jbang app install camel@apache/camel \
     && jbang config set cache-evict never
 
+RUN chgrp -R 0 $KARAVAN && chmod -R g+rwX $KARAVAN
+RUN chgrp -R 0 $DOT_CAMEL && chmod -R g+rwX $DOT_CAMEL
+
 EXPOSE 8080
-USER 1001
+
 CMD jbang $JBANG_OPTIONS -Dcamel.jbang.version=$CAMEL_VERSION 
camel@apache/camel run --source-dir=$CODE_DIR --console 
--local-kamelet-dir=$KAMELETS_DIR --maven-settings=$MAVEN_SETTINGS
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 4a1e82aa..d8068b0e 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -219,10 +219,9 @@ public class KubernetesService implements HealthCheck {
                 .withPorts(port)
                 .withImagePullPolicy("Always")
                 .withEnv(envVars)
-                .withCommand("/bin/sh", "-c", "/builder/build.sh")
+                .withCommand("/bin/sh", "-c", "/karavan/builder/build.sh")
                 .withVolumeMounts(
-//                        new 
VolumeMountBuilder().withName(name).withMountPath("/karavan/.jbang/cache").build()
-                        new 
VolumeMountBuilder().withName("builder").withMountPath("/builder").withReadOnly(true).build()
+                        new 
VolumeMountBuilder().withName("builder").withMountPath("/karavan/builder").withReadOnly(true).build()
                 )
                 .build();
 
@@ -232,8 +231,6 @@ public class KubernetesService implements HealthCheck {
                 .withRestartPolicy("Never")
                 .withServiceAccount(KARAVAN_SERVICE_ACCOUNT)
                 .withVolumes(
-//                        new VolumeBuilder().withName(name)
-//                                .withNewPersistentVolumeClaim(name, 
false).build(),
                         new VolumeBuilder().withName("builder")
                                 .withConfigMap(new 
ConfigMapVolumeSourceBuilder().withName(name).withItems(
                                         new 
KeyToPathBuilder().withKey("build.sh").withPath("build.sh").build()
@@ -404,7 +401,6 @@ public class KubernetesService implements HealthCheck {
                 .withImagePullPolicy("Always")
                 .withEnv(new 
EnvVarBuilder().withName(ENV_VAR_JBANG_OPTIONS).withValue(jbangOptions).build())
 //                .withVolumeMounts(
-//                        new 
VolumeMountBuilder().withName(name).withMountPath("/karavan/.jbang/cache").build()
 //                        new 
VolumeMountBuilder().withName("maven-settings").withSubPath("maven-settings.xml")
 //                                
.withMountPath("/karavan-config-map/maven-settings.xml").build()
 //                )
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index cb71a937..bb9d47d4 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -139,7 +139,6 @@ public class ProjectService implements HealthCheck {
         env.addAll(gitService.getEnvForBuild());
         env.addAll(List.of(
                 "PROJECT_ID=" + project.getProjectId(),
-                "JBANG_REPO=~/.m2",
                 "TAG=" + tag
         ));
         return env;