[jira] [Resolved] (GUACAMOLE-146) Finer control of the tomcat context path in Docker

2018-06-11 Thread Nick Couchman (JIRA)


 [ 
https://issues.apache.org/jira/browse/GUACAMOLE-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nick Couchman resolved GUACAMOLE-146.
-
Resolution: Implemented

Added the WEBAPP_CONTEXT variable to the script that starts up the Docker 
image, so you can control it using this variable.

> Finer control of the tomcat context path in Docker
> --
>
> Key: GUACAMOLE-146
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-146
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole-docker
>Reporter: Emmanuel Frecon
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 1.0.1
>
>
> The current auto-deployment of the guacamole within tomcat leads to having 
> the regular tomcat startup page mapped on {{/}} and guacamole mapped to 
> {{/guacamole}}. Being able to control where guacamole gets to be deployed and 
> served by tomcat would provide an increased flexibility when guacamole is 
> fitted to existing architectures. For example, most docker-based deployments 
> will use reverse-proxying to provide scalability and security.
> An initial fix for this is 
> [available|https://github.com/apache/incubator-guacamole-client/pull/97/commits/1386239d3c12987daa774ed387a41c1471444f87].
>  However, this does not provide full flexibility. As 
> [described|https://github.com/apache/incubator-guacamole-client/pull/97#issuecomment-268341268],
>  using an environment variable to control the context path would be a much 
> better solution as it would provide full flexibility while still maintaining 
> backwards compabitibility.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[2/2] guacamole-client git commit: GUACAMOLE-146: Merge changes allowing webapp context path to be overridden.

2018-06-11 Thread mjumper
GUACAMOLE-146: Merge changes allowing webapp context path to be overridden.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/bf3d2761
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/bf3d2761
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/bf3d2761

Branch: refs/heads/master
Commit: bf3d27611db6df6549c337ddc6063ad6a195d9ad
Parents: 164e608 65b03df
Author: Michael Jumper 
Authored: Mon Jun 11 14:19:45 2018 -0700
Committer: Michael Jumper 
Committed: Mon Jun 11 14:19:45 2018 -0700

--
 guacamole-docker/bin/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--




[1/2] guacamole-client git commit: GUACAMOLE-146: Allow webapp context to be specified in Docker with environment variable.

2018-06-11 Thread mjumper
Repository: guacamole-client
Updated Branches:
  refs/heads/master 164e6086a -> bf3d27611


GUACAMOLE-146: Allow webapp context to be specified in Docker with environment 
variable.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/65b03df3
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/65b03df3
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/65b03df3

Branch: refs/heads/master
Commit: 65b03df3bd7088fb7ef115a0d4c2a73c5e4d2293
Parents: 2daf38b
Author: Nick Couchman 
Authored: Mon Jun 11 13:07:43 2018 -0400
Committer: Nick Couchman 
Committed: Mon Jun 11 13:07:43 2018 -0400

--
 guacamole-docker/bin/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/65b03df3/guacamole-docker/bin/start.sh
--
diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index 6309265..9054a08 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -329,7 +329,7 @@ END
 start_guacamole() {
 
 # Install webapp
-ln -sf /opt/guacamole/guacamole.war /usr/local/tomcat/webapps/
+ln -sf /opt/guacamole/guacamole.war 
/usr/local/tomcat/webapps/${WEBAPP_CONTEXT:-guacamole}.war
 
 # Start tomcat
 cd /usr/local/tomcat



[jira] [Updated] (GUACAMOLE-146) Finer control of the tomcat context path in Docker

2018-06-11 Thread Nick Couchman (JIRA)


 [ 
https://issues.apache.org/jira/browse/GUACAMOLE-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nick Couchman updated GUACAMOLE-146:

Fix Version/s: 1.0.1

> Finer control of the tomcat context path in Docker
> --
>
> Key: GUACAMOLE-146
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-146
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole-docker
>Reporter: Emmanuel Frecon
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 1.0.1
>
>
> The current auto-deployment of the guacamole within tomcat leads to having 
> the regular tomcat startup page mapped on {{/}} and guacamole mapped to 
> {{/guacamole}}. Being able to control where guacamole gets to be deployed and 
> served by tomcat would provide an increased flexibility when guacamole is 
> fitted to existing architectures. For example, most docker-based deployments 
> will use reverse-proxying to provide scalability and security.
> An initial fix for this is 
> [available|https://github.com/apache/incubator-guacamole-client/pull/97/commits/1386239d3c12987daa774ed387a41c1471444f87].
>  However, this does not provide full flexibility. As 
> [described|https://github.com/apache/incubator-guacamole-client/pull/97#issuecomment-268341268],
>  using an environment variable to control the context path would be a much 
> better solution as it would provide full flexibility while still maintaining 
> backwards compabitibility.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[jira] [Assigned] (GUACAMOLE-146) Finer control of the tomcat context path in Docker

2018-06-11 Thread Nick Couchman (JIRA)


 [ 
https://issues.apache.org/jira/browse/GUACAMOLE-146?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nick Couchman reassigned GUACAMOLE-146:
---

Assignee: Nick Couchman

> Finer control of the tomcat context path in Docker
> --
>
> Key: GUACAMOLE-146
> URL: https://issues.apache.org/jira/browse/GUACAMOLE-146
> Project: Guacamole
>  Issue Type: Improvement
>  Components: guacamole-docker
>Reporter: Emmanuel Frecon
>Assignee: Nick Couchman
>Priority: Minor
> Fix For: 1.0.1
>
>
> The current auto-deployment of the guacamole within tomcat leads to having 
> the regular tomcat startup page mapped on {{/}} and guacamole mapped to 
> {{/guacamole}}. Being able to control where guacamole gets to be deployed and 
> served by tomcat would provide an increased flexibility when guacamole is 
> fitted to existing architectures. For example, most docker-based deployments 
> will use reverse-proxying to provide scalability and security.
> An initial fix for this is 
> [available|https://github.com/apache/incubator-guacamole-client/pull/97/commits/1386239d3c12987daa774ed387a41c1471444f87].
>  However, this does not provide full flexibility. As 
> [described|https://github.com/apache/incubator-guacamole-client/pull/97#issuecomment-268341268],
>  using an environment variable to control the context path would be a much 
> better solution as it would provide full flexibility while still maintaining 
> backwards compabitibility.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)