From 3920c509ca2b0d47390a19a179d20b0da80116f1 Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 9 Jul 2021 15:52:44 +0200 Subject: [PATCH] fix jira entrypoint --- .../docker-jira/image/resources/entrypoint.sh | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/infrastrucure/docker-jira/image/resources/entrypoint.sh b/infrastrucure/docker-jira/image/resources/entrypoint.sh index ee871ca..e1ec792 100644 --- a/infrastrucure/docker-jira/image/resources/entrypoint.sh +++ b/infrastrucure/docker-jira/image/resources/entrypoint.sh @@ -1,23 +1,5 @@ #!/bin/bash -function main() { - local fqdn_value=file_env "FQDN" - local db_username_value=file_env "DB_USERNAME" - local db_username_value=file_env "DB_PASSWORD" - - xmlstarlet ed -L -u "/Server/Service/Connector[@proxyName='{subdomain}.{domain}.com']/@proxyName" \ - -v "$fqdn_value" /opt/atlassian-jira-software-standalone/conf/server.xml - xmlstarlet ed -L -u "/jira-database-config/jdbc-datasource/username" \ - -v "$db_username_value" /app/dbconfig.xml - xmlstarlet ed -L -u "/jira-database-config/jdbc-datasource/password" \ - -v "$db_username_value" /app/dbconfig.xml - - install -ojira -gjira -m660 /app/dbconfig.xml /var/jira/dbconfig.xml - /opt/atlassian-jira-software-standalone/bin/setenv.sh run - /opt/atlassian-jira-software-standalone/bin/start-jira.sh run -} - - # usage: file_env VAR [DEFAULT] # ie: file_env 'XYZ_DB_PASSWORD' 'example' # (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of @@ -42,4 +24,21 @@ function file_env() { unset "$fileVar" } +function main() { + local fqdn_value=$(file_env "FQDN") + local db_username_value=$(file_env "DB_USERNAME") + local db_username_value=$(file_env "DB_PASSWORD") + + xmlstarlet ed -L -u "/Server/Service/Connector[@proxyName='{subdomain}.{domain}.com']/@proxyName" \ + -v "$fqdn_value" /opt/atlassian-jira-software-standalone/conf/server.xml + xmlstarlet ed -L -u "/jira-database-config/jdbc-datasource/username" \ + -v "$db_username_value" /app/dbconfig.xml + xmlstarlet ed -L -u "/jira-database-config/jdbc-datasource/password" \ + -v "$db_username_value" /app/dbconfig.xml + + install -ojira -gjira -m660 /app/dbconfig.xml /var/jira/dbconfig.xml + /opt/atlassian-jira-software-standalone/bin/setenv.sh run + /opt/atlassian-jira-software-standalone/bin/start-jira.sh run +} + main