From 68d55bd1ff12615e1d48003f488c98d2732a923f Mon Sep 17 00:00:00 2001
From: batee <emily.bateman@pega.com>
Date: Mon, 2 Mar 2020 11:31:57 -0500
Subject: [PATCH 1/4] ISSUE-60: High-level configuration overview

---
 pega-config-mgt.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pega-config-mgt.md

diff --git a/pega-config-mgt.md b/pega-config-mgt.md
new file mode 100644
index 00000000..81a075f9
--- /dev/null
+++ b/pega-config-mgt.md
@@ -0,0 +1,14 @@
+## Current State of Pega Platform Configuration in pegasystems/pega  
+
+The pegasystems/pega image in conjunction with [Pega Helm Charts](https://github.com/pegasystems/pega-helm-charts) provides multiple ways to configure and customize a Pega deployment
+
+The following table provides an overview of the different configuration files in the deployment and the intended use:
+
+| File Name | Source | Purpose | Customizability |
+| ---       | ---    | ---     | ---             |
+|prconfig.xml|prweb.war|Base prconfig.xml *Note: May be overidden by helm deployment* | None |
+|prlog4j2.xml|prweb.war|Base prlog4j2.xml *Note: May be overidden by helm deployment* | None |
+|context.xml|pegasystems/tomcat|Base web application context *Note: May be overidden by helm deployment* | None |
+|[prweb.xml](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/Catalina/localhost/prweb.xml)|docker-pega-web-ready|Recommended Pega platform configuration for Kubernetes *Note: Parameter settings may be overridden by helm* | Parameter values customizable via environment variables |
+|[context.xml.tmpl](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/context.xml.tmpl)|docker-pega-web-ready|Templatized web application context *Note: Parameter settings may be overridden by helm*| Parameter values customizable via environment variables |
+|[setenv.sh](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-bin/setenv.sh)|docker-pega-web-ready|Sets up environment for Tomcat startup | Values customizable via environment variables |

From 812821602c751b0d55af2feb6f586b97a76edd82 Mon Sep 17 00:00:00 2001
From: batee <emily.bateman@pega.com>
Date: Mon, 2 Mar 2020 11:47:03 -0500
Subject: [PATCH 2/4] ISSUE-60: Add newline for notes

---
 pega-config-mgt.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pega-config-mgt.md b/pega-config-mgt.md
index 81a075f9..cfbed676 100644
--- a/pega-config-mgt.md
+++ b/pega-config-mgt.md
@@ -6,9 +6,9 @@ The following table provides an overview of the different configuration files in
 
 | File Name | Source | Purpose | Customizability |
 | ---       | ---    | ---     | ---             |
-|prconfig.xml|prweb.war|Base prconfig.xml *Note: May be overidden by helm deployment* | None |
-|prlog4j2.xml|prweb.war|Base prlog4j2.xml *Note: May be overidden by helm deployment* | None |
-|context.xml|pegasystems/tomcat|Base web application context *Note: May be overidden by helm deployment* | None |
-|[prweb.xml](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/Catalina/localhost/prweb.xml)|docker-pega-web-ready|Recommended Pega platform configuration for Kubernetes *Note: Parameter settings may be overridden by helm* | Parameter values customizable via environment variables |
-|[context.xml.tmpl](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/context.xml.tmpl)|docker-pega-web-ready|Templatized web application context *Note: Parameter settings may be overridden by helm*| Parameter values customizable via environment variables |
+|prconfig.xml|prweb.war|Base prconfig.xml <br/>*Note: May be overidden by helm deployment* | None |
+|prlog4j2.xml|prweb.war|Base prlog4j2.xml <br/>*Note: May be overidden by helm deployment* | None |
+|context.xml|pegasystems/tomcat|Base web application context <br/>*Note: May be overidden by helm deployment* | None |
+|[prweb.xml](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/Catalina/localhost/prweb.xml)|docker-pega-web-ready|Recommended Pega platform configuration for Kubernetes <br/>*Note: Parameter settings may be overridden by helm* | Parameter values customizable via environment variables |
+|[context.xml.tmpl](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/context.xml.tmpl)|docker-pega-web-ready|Templatized web application context <br/>*Note: Parameter settings may be overridden by helm*| Parameter values customizable via environment variables |
 |[setenv.sh](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-bin/setenv.sh)|docker-pega-web-ready|Sets up environment for Tomcat startup | Values customizable via environment variables |

From e1773617ce1bd3caf688fa2277ecb59c840a1ef5 Mon Sep 17 00:00:00 2001
From: batee <emily.bateman@pega.com>
Date: Mon, 2 Mar 2020 11:49:51 -0500
Subject: [PATCH 3/4] ISSUE-60: Add additional newline for notes

---
 pega-config-mgt.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pega-config-mgt.md b/pega-config-mgt.md
index cfbed676..a825bdf7 100644
--- a/pega-config-mgt.md
+++ b/pega-config-mgt.md
@@ -6,9 +6,9 @@ The following table provides an overview of the different configuration files in
 
 | File Name | Source | Purpose | Customizability |
 | ---       | ---    | ---     | ---             |
-|prconfig.xml|prweb.war|Base prconfig.xml <br/>*Note: May be overidden by helm deployment* | None |
-|prlog4j2.xml|prweb.war|Base prlog4j2.xml <br/>*Note: May be overidden by helm deployment* | None |
-|context.xml|pegasystems/tomcat|Base web application context <br/>*Note: May be overidden by helm deployment* | None |
-|[prweb.xml](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/Catalina/localhost/prweb.xml)|docker-pega-web-ready|Recommended Pega platform configuration for Kubernetes <br/>*Note: Parameter settings may be overridden by helm* | Parameter values customizable via environment variables |
-|[context.xml.tmpl](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/context.xml.tmpl)|docker-pega-web-ready|Templatized web application context <br/>*Note: Parameter settings may be overridden by helm*| Parameter values customizable via environment variables |
+|prconfig.xml|prweb.war|Base prconfig.xml <br/><br/>*Note: May be overidden by helm deployment* | None |
+|prlog4j2.xml|prweb.war|Base prlog4j2.xml <br/><br/>*Note: May be overidden by helm deployment* | None |
+|context.xml|pegasystems/tomcat|Base web application context <br/><br/>*Note: May be overidden by helm deployment* | None |
+|[prweb.xml](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/Catalina/localhost/prweb.xml)|docker-pega-web-ready|Recommended Pega platform configuration for Kubernetes <br/><br/>*Note: Parameter settings may be overridden by helm* | Parameter values customizable via environment variables |
+|[context.xml.tmpl](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-conf/context.xml.tmpl)|docker-pega-web-ready|Templatized web application context <br/><br/>*Note: Parameter settings may be overridden by helm*| Parameter values customizable via environment variables |
 |[setenv.sh](https://github.com/pegasystems/docker-pega-web-ready/blob/master/tomcat-bin/setenv.sh)|docker-pega-web-ready|Sets up environment for Tomcat startup | Values customizable via environment variables |

From c0425e0dd16c45b2ad67b2066b0ec2cad3b1a618 Mon Sep 17 00:00:00 2001
From: batee <emily.bateman@pega.com>
Date: Thu, 12 Mar 2020 12:07:29 -0400
Subject: [PATCH 4/4] ISSUE-64: Move extracted prweb.war content and associated
 config to custom app context dir

---
 scripts/docker-entrypoint.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index a4e34a37..76066746 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -126,8 +126,6 @@ else
    export SECRET_CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD}
 fi
 
-/bin/dockerize -template ${CATALINA_HOME}/conf/Catalina/localhost/prweb.xml:${CATALINA_HOME}/conf/Catalina/localhost/prweb.xml
-
 #
 # Copying mounted prlog4j2 file to webapps/prweb/WEB-INF/classes
 #
@@ -148,6 +146,16 @@ else
   echo "No prconfig was specified in ${prconfig}.  Using defaults."
 fi
 
+/bin/dockerize -template ${CATALINA_HOME}/conf/Catalina/localhost/prweb.xml:${CATALINA_HOME}/conf/Catalina/localhost/${PEGA_APP_CONTEXT_ROOT}.xml
+
+#
+# Move app to custom context root if specified
+#
+if [ ${PEGA_APP_CONTEXT_ROOT} != "prweb" ]; then
+    mv ${CATALINA_HOME}/webapps/prweb ${CATALINA_HOME}/webapps/${PEGA_APP_CONTEXT_ROOT}
+    rm ${CATALINA_HOME}/conf/Catalina/localhost/prweb.xml
+fi    
+
 #
 # Write config files from templates using dockerize ...
 #