You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2024/03/08 16:20:35 UTC
(camel-karavan) branch main updated: Remove m2 cache
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 79ba2b6b Remove m2 cache
79ba2b6b is described below
commit 79ba2b6bf0efb051c1709b5b68a43e7b33d72108
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Mar 8 11:20:26 2024 -0500
Remove m2 cache
---
.../apache/camel/karavan/docker/DockerForKaravan.java | 17 ++++-------------
karavan-app/src/main/resources/application.properties | 1 -
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
index 42c9d6f0..34cb6459 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
@@ -28,6 +28,7 @@ import org.apache.camel.karavan.service.ProjectService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -42,9 +43,6 @@ public class DockerForKaravan {
@ConfigProperty(name = "karavan.devmode.image")
String devmodeImage;
- @ConfigProperty(name = "karavan.maven.cache")
- Optional<String> mavenCache;
-
@Inject
DockerService dockerService;
@@ -53,8 +51,7 @@ public class DockerForKaravan {
public void runProjectInDevMode(String projectId, String jBangOptions, Map<Integer, Integer> ports,
Map<String, String> files) throws Exception {
- Map<String, String> volumes = getMavenVolumes();
- Container c = createDevmodeContainer(projectId, jBangOptions, ports, volumes);
+ Container c = createDevmodeContainer(projectId, jBangOptions, ports, new HashMap<>());
dockerService.runContainer(projectId);
dockerService.copyFiles(c.getId(), "/karavan/code", files, true);
}
@@ -84,9 +81,8 @@ public class DockerForKaravan {
public void runBuildProject(Project project, String script, List<String> env, Map<String, String> sshFiles, String tag) throws Exception {
String containerName = project.getProjectId() + BUILDER_SUFFIX;
- Map<String, String> volumes = getMavenVolumes();
dockerService.deleteContainer(containerName);
- Container c = createBuildContainer(containerName, project, env, volumes, tag);
+ Container c = createBuildContainer(containerName, project, env, new HashMap<>(0), tag);
dockerService.copyExecFile(c.getId(), "/karavan/builder", "build.sh", script);
sshFiles.forEach((name, text) -> {
dockerService.copyExecFile(c.getId(), "/karavan/.ssh", name, text);
@@ -108,9 +104,4 @@ public class DockerForKaravan {
null, null, null, null,
"/karavan/builder/build.sh");
}
-
- private Map<String,String> getMavenVolumes(){
- return mavenCache.map(s -> Map.of(s, "/karavan/.m2")).orElseGet(Map::of);
- }
-
-}
+}
\ No newline at end of file
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index 364beb04..7815c76c 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -31,7 +31,6 @@ karavan.devmode.create-pvc=false
karavan.devmode.service.account=karavan
karavan.builder.service.account=karavan
karavan.secret.name=karavan
-karavan.maven.cache=
karavan.docker.network=karavan