Merge branch 'feature/EOEPCA-863' into develop

EOEPCA · Apr 26, 2023 · b906272 · b906272
2 parents 1fb1f42 + 77b26df
commit b906272
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,3 +85,4 @@ t2regcred.yaml
 workspace.code-workspace
 
 
+/charts/ades/values.minikube-dev.terradue.yaml
diff --git a/build.yml b/build.yml
@@ -1,3 +1,2 @@
 docker_image_name: eoepca/proc-ades
-docker_image_version: 2.0.13
-
+docker_image_version: 2.0.14
diff --git a/charts/ades/files/main.cfg.tpl b/charts/ades/files/main.cfg.tpl
@@ -75,11 +75,10 @@ resourceManagerWorkspacePrefix= {{ .Values.workflowExecutor.resourceManagerWorks
 [eoepca]
 owsparser=/opt/t2libs/libeoepcaows.so
 buildPath=/opt/t2template/
-
+usernameJwtJsonPath="pct_claims.user_name"
 WorkflowExecutorHost=http://localhost:8000
 WorkflowExecutorConfig=/opt/t2config/workflowwxecutorconfig.json
 libWorkflowExecutor=/opt/t2service/libworkflow_executor.so
-
 userworkspace=/opt/zooservices_user
 defaultUser=anonymous
 userSpaceScript=/opt/t2scripts/prepareUserSpace.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ t2regcred.yaml
		workspace.code-workspace


		/charts/ades/values.minikube-dev.terradue.yaml