GUACAMOLE-682: docker build with optional maven profile #347
Conversation
This file contains 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
To include library for RADIUS authentication in the docker image the build needs to activate the maven profile "lgpl-extentions" and copy the library into the image. The docker start script needs to pass through settings and link the library to GUACAMOLE_HOME.
jolentes
changed the title
jolentes
changed the title
necouchman
requested changes
Dec 21, 2018
| mvn package | ||
| else | ||
| mvn -P "$BUILD_PROFILE" package | ||
| fi |
There was a problem hiding this comment.
Please stick with accepted style of four-space indentations.
|
|
||
| if [ -f extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar ]; then | ||
| mkdir -p "$DESTINATION/radius" | ||
| cp extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar "$DESTINATION/radius" |
There was a problem hiding this comment.
As with above, four-space indentations, please
necouchman
approved these changes
Dec 22, 2018
There was a problem hiding this comment.
Looks good go to me. @mike-jumper you okay with these changes?
mike-jumper
requested changes
Dec 22, 2018
| @@ -41,6 +41,7 @@ | |||
|
|
|||
| BUILD_DIR="$1" | |||
| DESTINATION="$2" | |||
| BUILD_PROFILE="$3" | |||
There was a problem hiding this comment.
This new BUILD_PROFILE parameter for build-guacamole.sh needs to be documented with an @param in the corresponding comment block:
guacamole-client/guacamole-docker/bin/build-guacamole.sh
Lines 21 to 40 in 516dbfd
There was a problem hiding this comment.
added the parameter documentation as requested
mike-jumper
approved these changes
Dec 24, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Extending docker build process to allow passing maven profile to include radius auth.