GUACAMOLE-682: fix env variable passing
authorJoern Lentes <joern.lentes@web.de>
Fri, 21 Dec 2018 13:50:46 +0000 (14:50 +0100)
committerJoern Lentes <joern.lentes@web.de>
Fri, 21 Dec 2018 13:50:46 +0000 (14:50 +0100)
Dockerfile
guacamole-docker/bin/build-guacamole.sh
guacamole-docker/bin/start.sh

index 7eefcc8..8c12c75 100644 (file)
@@ -30,6 +30,8 @@ ARG TOMCAT_JRE=jre8
 # Use official maven image for the build
 FROM maven:3-jdk-8 AS builder
 
+ARG BUILD_PROFILE
+
 # Build environment variables
 ENV \
     BUILD_DIR=/tmp/guacamole-docker-BUILD
@@ -41,7 +43,7 @@ COPY guacamole-docker/bin/ /opt/guacamole/bin/
 COPY . "$BUILD_DIR"
 
 # Run the build itself
-RUN /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole
+RUN /opt/guacamole/bin/build-guacamole.sh "$BUILD_DIR" /opt/guacamole "$BUILD_PROFILE"
 
 # For the runtime image, we start with the official Tomcat distribution
 FROM tomcat:${TOMCAT_VERSION}-${TOMCAT_JRE}
index 1f4ab77..acb1d3f 100755 (executable)
@@ -41,6 +41,7 @@
 
 BUILD_DIR="$1"
 DESTINATION="$2"
+BUILD_PROFILE="$3"
 
 #
 # Create destination, if it does not yet exist
@@ -116,7 +117,7 @@ tar -xzf extensions/guacamole-auth-ldap/target/*.tar.gz \
 # Copy Radius auth extension if it was build
 #
 
-if [[ "$BUILD_PROFILE ~= "lgpl-extentions" ]]; then
+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"
 fi
index 8fb3bc1..0732283 100755 (executable)
@@ -370,7 +370,7 @@ make sure they are readable for the user in the container.
 END
         exit 1;
     fi
-    if [ $RADIUS_AUTH_PROTOCOL == "eap-ttls" -a -z "$RADIUS_EAP_TTLS_INNER_PROTOCOL" ]; then
+    if [ "$RADIUS_AUTH_PROTOCOL" == "eap-ttls" -a -z "$RADIUS_EAP_TTLS_INNER_PROTOCOL" ]; then
        cat <<END
 FATAL: Authentication protocol "eap-ttls" specified but
        RADIUS_EAP_TTLS_INNER_PROTOCOL is not set!