diff --git a/charts/alfresco-common/Chart.yaml b/charts/alfresco-common/Chart.yaml index c27c2947..ef93ce14 100644 --- a/charts/alfresco-common/Chart.yaml +++ b/charts/alfresco-common/Chart.yaml @@ -5,7 +5,7 @@ description: | A helper subchart to avoid duplication in alfresco charts and set common external dependencies type: library -version: 3.0.0-alpha.3 +version: 3.0.0-alpha.4 dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts diff --git a/charts/alfresco-common/README.md b/charts/alfresco-common/README.md index 47a3604b..5a400491 100644 --- a/charts/alfresco-common/README.md +++ b/charts/alfresco-common/README.md @@ -1,6 +1,6 @@ # alfresco-common -![Version: 3.0.0-alpha.3](https://img.shields.io/badge/Version-3.0.0--alpha.3-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) +![Version: 3.0.0-alpha.4](https://img.shields.io/badge/Version-3.0.0--alpha.4-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) A helper subchart to avoid duplication in alfresco charts and set common external dependencies diff --git a/charts/alfresco-common/templates/_helpers-jdbc.tpl b/charts/alfresco-common/templates/_helpers-jdbc.tpl index 625d8862..73ce9aaf 100644 --- a/charts/alfresco-common/templates/_helpers-jdbc.tpl +++ b/charts/alfresco-common/templates/_helpers-jdbc.tpl @@ -102,15 +102,15 @@ Usage: include "alfresco-common.db.hostname" "URL" {{/* Provide database port from JDBC URL -Usage: include "alfresco-common.db.port" (dict "url" "someurl") +Usage: include "alfresco-common.db.port" "URL" */}} {{- define "alfresco-common.db.port" -}} -{{- $socket := (index (include "alfresco-common.jdbc.parser" .url | fromJson) "jdbc" "host") }} +{{- $socket := (index (include "alfresco-common.jdbc.parser" . | fromJson) "jdbc" "host") }} {{- if gt ($socket | splitList ":" | len) 1 }} {{- $socket | splitList ":" | last }} {{- else }} - {{- template "alfresco-common.db.default.port" (index (include "alfresco-common.jdbc.parser" .url | fromJson) "jdbc" "scheme") }} + {{- template "alfresco-common.db.default.port" (index (include "alfresco-common.jdbc.parser" . | fromJson) "jdbc" "scheme") }} {{- end }} {{- end -}}