You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by jolentes <gi...@git.apache.org> on 2018/12/21 14:09:36 UTC
[GitHub] guacamole-client pull request #347: Feature docker build radius
GitHub user jolentes opened a pull request:
https://github.com/apache/guacamole-client/pull/347
Feature docker build radius
Extending docker build process to allow passing maven profile to include radius auth.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/jolentes/guacamole-client feature_docker_build_radius
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/guacamole-client/pull/347.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #347
----
commit 0f31028565a539c25a9a67d72b4901db024506e1
Author: Joern Lentes <jo...@...>
Date: 2018-12-21T10:15:25Z
GUACAMOLE-682: add option to include RADIUS authentication in docker
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.
commit 95611f2d936e2434829209ad6caa5f9b4a586efa
Author: Joern Lentes <jo...@...>
Date: 2018-12-21T13:50:46Z
GUACAMOLE-682: fix env variable passing
commit 2e98f6f8a0153d8a3c9f24c8dbb0658acd085b6d
Author: Joern Lentes <jo...@...>
Date: 2018-12-21T14:04:28Z
GUACAMOLE-682: added comment with example to build with RADIUS
----
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243608567
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -53,7 +54,12 @@ mkdir -p "$DESTINATION"
#
cd "$BUILD_DIR"
-mvn package
+
+if [ -z "$BUILD_PROFILE" ]; then
+ mvn package
+else
+ mvn -P "$BUILD_PROFILE" package
+fi
--- End diff --
Please stick with accepted style of four-space indentations.
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by necouchman <gi...@git.apache.org>.
Github user necouchman commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243608670
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -107,3 +113,11 @@ tar -xzf extensions/guacamole-auth-ldap/target/*.tar.gz \
"*.jar" \
"*.ldif"
+#
+# Copy Radius auth extension if it was build
+#
+
+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"
--- End diff --
As with above, four-space indentations, please
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by jolentes <gi...@git.apache.org>.
Github user jolentes commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243730984
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -107,3 +113,11 @@ tar -xzf extensions/guacamole-auth-ldap/target/*.tar.gz \
"*.jar" \
"*.ldif"
+#
+# Copy Radius auth extension if it was build
+#
+
+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"
--- End diff --
corrected
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by mike-jumper <gi...@git.apache.org>.
Github user mike-jumper commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243742443
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -41,6 +41,7 @@
BUILD_DIR="$1"
DESTINATION="$2"
+BUILD_PROFILE="$3"
--- End diff --
This new `BUILD_PROFILE` parameter for `build-guacamole.sh` needs to be documented with an `@param` in the corresponding comment block (see the Doxygen-style block above covering this script and the other two parameters).
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/guacamole-client/pull/347
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by jolentes <gi...@git.apache.org>.
Github user jolentes commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243730976
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -53,7 +54,12 @@ mkdir -p "$DESTINATION"
#
cd "$BUILD_DIR"
-mvn package
+
+if [ -z "$BUILD_PROFILE" ]; then
+ mvn package
+else
+ mvn -P "$BUILD_PROFILE" package
+fi
--- End diff --
corrected
---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
Posted by jolentes <gi...@git.apache.org>.
Github user jolentes commented on a diff in the pull request:
https://github.com/apache/guacamole-client/pull/347#discussion_r243775904
--- Diff: guacamole-docker/bin/build-guacamole.sh ---
@@ -41,6 +41,7 @@
BUILD_DIR="$1"
DESTINATION="$2"
+BUILD_PROFILE="$3"
--- End diff --
added the parameter documentation as requested
---