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
commit bed2e38d52be0282d1b73a39dcdfb0584367ef3c
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Sep 6 17:17:29 2023 -0400
Karavan out of Docker for #817
---
.../main/java/org/apache/camel/karavan/service/GitService.java | 10 +++++++++-
.../karavan-app/src/main/resources/application.properties | 2 +-
karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts | 4 ++--
.../src/main/webui/src/project/build/BuildStatus.tsx | 2 +-
.../src/main/webui/src/project/log/ProjectLogPanel.tsx | 2 +-
.../src/main/webui/src/projects/ProjectsTableRow.tsx | 2 +-
.../src/main/webui/src/templates/TemplatesTableRow.tsx | 2 +-
7 files changed, 16 insertions(+), 8 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index 399a52f7..47329fb0 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -96,11 +96,19 @@ public class GitService {
branch = new
String(Base64.getDecoder().decode(secret.getData().get("git-branch").getBytes(StandardCharsets.UTF_8)));
}
return new GitConfig(uri, username, password, branch);
- } else {
+ } else if (ConfigService.inDocker()) {
String uri = ConfigProvider.getConfig().getValue(propertiesPrefix
+ "git-repository", String.class);
String username =
ConfigProvider.getConfig().getValue(propertiesPrefix + "git-username",
String.class);
String password =
ConfigProvider.getConfig().getValue(propertiesPrefix + "git-password",
String.class);
return new GitConfig(uri, username, password, branch);
+ } else {
+ Boolean giteaInstall =
ConfigProvider.getConfig().getValue(propertiesPrefix + "git-install-gitea",
Boolean.class);
+ String uri = giteaInstall
+ ? "http://localhost:3000/karavan/karavan.git";
+ : ConfigProvider.getConfig().getValue(propertiesPrefix +
"git-repository", String.class);
+ String username =
ConfigProvider.getConfig().getValue(propertiesPrefix + "git-username",
String.class);
+ String password =
ConfigProvider.getConfig().getValue(propertiesPrefix + "git-password",
String.class);
+ return new GitConfig(uri, username, password, branch);
}
}
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties
b/karavan-web/karavan-app/src/main/resources/application.properties
index 6200868d..4575a8b0 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -7,7 +7,7 @@ karavan.camel.status.interval=2s
karavan.container.status.interval=2s
karavan.container.statistics.interval=10s
karavan.devmode.image=ghcr.io/apache/camel-karavan-devmode:4.0.0-RC2
-karavan.maven.cache=
+karavan.maven.cach
# Git repository Configuration
karavan.git-repository=http://gitea:3000/karavan/karavan.git
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
b/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
index 5c162c08..d42886ee 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectStore.ts
@@ -272,7 +272,7 @@ interface LogState {
currentLine: number;
setCurrentLine: (currentLine: number) => void;
showLog: boolean,
- setShowLog: (showLog: boolean, type: 'container' | 'build' | 'none',
podName: string) => void;
+ setShowLog: (showLog: boolean, type: 'container' | 'build' | 'none',
podName?: string) => void;
type: 'container' | 'build' | 'none',
setType: (type: 'container' | 'build' | 'none') => void,
}
@@ -300,7 +300,7 @@ export const useLogStore =
createWithEqualityFn<LogState>((set) => ({
set((state: LogState) => ({currentLine: currentLine}))
},
showLog: false,
- setShowLog: (showLog: boolean, type: 'container' | 'build' | 'none',
podName: string) => {
+ setShowLog: (showLog: boolean, type: 'container' | 'build' | 'none',
podName?: string) => {
set(() => ({showLog: showLog, type: type, podName: podName}));
},
type: "none",
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/build/BuildStatus.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/build/BuildStatus.tsx
index c5802145..e3a29ffc 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/build/BuildStatus.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/build/BuildStatus.tsx
@@ -61,7 +61,7 @@ export function BuildStatus (props: Props) {
function build() {
setIsBuilding(true);
- setShowLog(false,'build', '')
+ setShowLog(false,'none')
KaravanApi.buildProject(project, env, res => {
if (res.status === 200 || res.status === 201) {
setIsBuilding(false);
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
index bd397f3f..0c5a2f1a 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/log/ProjectLogPanel.tsx
@@ -69,7 +69,7 @@ export function ProjectLogPanel () {
}} icon={height === "100%" ? <CollapseIcon/> : <ExpandIcon/>}/>
</Tooltip>
<Button variant="plain" onClick={() => {
- setShowLog(false);
+ setShowLog(false, 'none');
setHeight(INITIAL_LOG_HEIGHT);
ProjectEventBus.sendLog('set', '')
}} icon={<CloseIcon/>}/>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
index caaa0b20..3944c6f7 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
@@ -63,7 +63,7 @@ export function ProjectsTableRow (props: Props) {
<Td>
<Button style={{padding: '6px'}} variant={"link"} onClick={e
=> {
// setProject(project, "select");
- setShowLog(false);
+ setShowLog(false, 'none');
// ProjectEventBus.selectProject(project);
navigate("/projects/"+ project.projectId);
}}>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesTableRow.tsx
b/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesTableRow.tsx
index 41d93cbf..f288dc16 100644
--- a/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesTableRow.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesTableRow.tsx
@@ -57,7 +57,7 @@ export function TemplatesTableRow (props: Props) {
<Td>
<Button style={{padding: '6px'}} variant={"link"} onClick={e
=> {
// setProject(project, "select");
- setShowLog(false);
+ setShowLog(false, 'none');
// ProjectEventBus.selectProject(project);
navigate("/projects/"+ project.projectId);
}}>
