GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificate#1098
Open
tiborauer wants to merge 24 commits intoapache:mainfrom
Open
GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificate#1098tiborauer wants to merge 24 commits intoapache:mainfrom
tiborauer wants to merge 24 commits intoapache:mainfrom
Conversation
Author
|
This is a duplicate of #1068 to change the source branch to a feature branch rather than the main one. |
GUACAMOLE-2114: Custom CATALINA_BASE
GUACAMOLE-2114: Custom base for CATALINA_BASE and GUACAMOLE_HOME
GUACAMOLE-2114: WEBAPPS_BASE, handle if not empty
GUACAMOLE-2114: fix pre-configured GUACAMOLE_HOME
GUACAMOLE-2114: fix features for pre-configured GUACAMOLE_HOME
GUACAMOLE-2114: fix features for pre-configured GUACAMOLE_HOME
Contributor
|
@tiborauer You have a bunch of extra commits in here - Merge commits, and some extra ones from GUACAMOLE-2114. These should all be cleaned up so that you only have the commits related to these changes. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR takes over
#694
#805