From bfd582936df735306ae244f8de1fbf06ba0c78c9 Mon Sep 17 00:00:00 2001
From: ThanKarab <tkarabatsis@hotmail.com>
Date: Mon, 27 Jan 2020 16:48:19 +0200
Subject: [PATCH] Merged the galaxy-workflow parameters.
---
.gitignore | 1 +
docker/config/application.tmpl | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index bb28673b3..27d6ff1fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ project/
/.project
/.settings/
dependency-reduced-pom.xml
+logs/
diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl
index e34a00c0c..03ad06261 100644
--- a/docker/config/application.tmpl
+++ b/docker/config/application.tmpl
@@ -80,13 +80,13 @@ services:
exareme:
miningExaremeUrl: {{ default .Env.EXAREME_URL "http://localhost:9090" }}/mining/query
algorithmsUrl: {{ default .Env.EXAREME_URL "http://localhost:9090" }}/mining/algorithms.json
- workflows:
- workflowUrl: {{ default .Env.WORKFLOW_URL "http://localhost:9090" }}
- jwtSecret: {{ default .Env.JWT_SECRET "secret" }}
- workflowAuthorization: {{ default .Env.WORKFLOW_AUTHORIZATION "undefined" }}
+
galaxy:
+ galaxyUrl: {{ default .Env.GALAXY_URL "http://localhost:8090/nativeGalaxy" }}
+ galaxyContext: {{ default .Env.GALAXY_CONTEXT "nativeGalaxy/workflows/list" }}
+ galaxyApiKey: {{ .Env.GALAXY_API_KEY }}
galaxyUsername: {{ default .Env.GALAXY_USERNAME "admin" }}
galaxyPassword: {{ default .Env.GALAXY_PASSWORD "password" }}
- galaxyContext: {{ default .Env.GALAXY_CONTEXT "nativeGalaxy" }}
+
keycloak:
keycloakUrl: {{ .Env.KEYCLOAK_URL }}
--
GitLab