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

commit 98873e88abab5e36dc061bb4d99fbcf349ebde52
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Sat Sep 16 19:42:16 2023 -0400

    Prepare to work in Openshift for #885
---
 karavan-web/docker/Dockerfile.devmode                               | 1 +
 .../main/java/org/apache/camel/karavan/docker/DockerForKaravan.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/karavan-web/docker/Dockerfile.devmode 
b/karavan-web/docker/Dockerfile.devmode
index 6ef09a9c..34fea67a 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -29,6 +29,7 @@ RUN mkdir -p $DOT_CAMEL \
 RUN chgrp -R 0 $KARAVAN && chmod -R g+rwX $KARAVAN
 RUN chgrp -R 0 $DOT_CAMEL && chmod -R g+rwX $DOT_CAMEL
 RUN chgrp -R 0 $HOME && chmod -R g+rwX $HOME
+RUN chgrp -R 0 /root/.m2 && chmod -R g+rwX $/root/.m2
 
 RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
     && jbang trust add  --quiet  https://github.com/apache/camel \
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
index 2789033c..a850dc4f 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
@@ -54,7 +54,7 @@ public class DockerForKaravan {
         Map<String, String> volumes = getMavenVolumes();
         Container c = createDevmodeContainer(projectId, jBangOptions, ports, 
volumes);
         dockerService.runContainer(projectId);
-        dockerService.copyFiles(c.getId(), "/code", files);
+        dockerService.copyFiles(c.getId(), "/karavan/code", files);
     }
 
     protected Container createDevmodeContainer(String projectId, String 
jBangOptions, Map<Integer, Integer> ports, Map<String, String> volumes) throws 
InterruptedException {
@@ -79,7 +79,7 @@ public class DockerForKaravan {
         Map<String, String> volumes = getMavenVolumes();
         dockerService.deleteContainer(containerName);
         Container c = createBuildContainer(containerName, project, env, 
volumes, tag);
-        dockerService.copyExecFile(c.getId(), "/karavan", "build.sh", script);
+        dockerService.copyExecFile(c.getId(), "/karavan/builder", "build.sh", 
script);
         dockerService.runContainer(c);
     }
 
@@ -93,7 +93,7 @@ public class DockerForKaravan {
                         LABEL_PROJECT_ID, project.getProjectId(),
                         LABEL_TAG, tag
                 ),
-                volumes, null,RestartPolicy.noRestart(), "/karavan/build.sh");
+                volumes, null,RestartPolicy.noRestart(), 
"/karavan/builder/build.sh");
     }
 
     private Map<String,String> getMavenVolumes(){