[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
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...
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 ---
[GitHub] guacamole-client pull request #347: GUACAMOLE-682: docker build with optiona...
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...
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...
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...
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...
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 ---
