[guacamole-client] branch staging/1.1.0 updated: GUACAMOLE-146: Pre-clean the webapp context before deploying it.

[mjumper]

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git


The following commit(s) were added to refs/heads/staging/1.1.0 by this push:
     new 380b88c  GUACAMOLE-146: Pre-clean the webapp context before deploying 
it.
     new 3c9302f  GUACAMOLE-146: Merge automatic removal of exploded webapp 
context prior to deployment.
380b88c is described below

commit 380b88c0956f6f8963f103cbc63d9c68205b759a
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Fri Apr 19 15:01:52 2019 -0400

    GUACAMOLE-146: Pre-clean the webapp context before deploying it.
---
 guacamole-docker/bin/start.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index 6d5af95..be97901 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -575,6 +575,7 @@ END
 start_guacamole() {
 
     # Install webapp
+    rm -Rf /usr/local/tomcat/webapps/${WEBAPP_CONTEXT:-guacamole}
     ln -sf /opt/guacamole/guacamole.war 
/usr/local/tomcat/webapps/${WEBAPP_CONTEXT:-guacamole}.war
 
     # Start tomcat