safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-682: fix env variable passing

Browse Source
This commit is contained in:
Joern Lentes
2018-12-21 14:50:46 +01:00
parent 0f31028565
commit 95611f2d93
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -30,6 +30,8 @@ ARG TOMCAT_JRE=jre8
# Use official maven image for the build # Use official maven image for the build
FROM maven:3-jdk-8 AS builder FROM maven:3-jdk-8 AS builder
ARG BUILD_PROFILE
# Build environment variables # Build environment variables
ENV \ ENV \
BUILD_DIR=/tmp/guacamole-docker-BUILD BUILD_DIR=/tmp/guacamole-docker-BUILD
@@ -41,7 +43,7 @@ COPY guacamole-docker/bin/ /opt/guacamole/bin/
COPY . "$BUILD_DIR" COPY . "$BUILD_DIR"
# Run the build itself # 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 # For the runtime image, we start with the official Tomcat distribution
FROM tomcat:${TOMCAT_VERSION}-${TOMCAT_JRE} FROM tomcat:${TOMCAT_VERSION}-${TOMCAT_JRE}

3
guacamole-docker/bin/build-guacamole.sh
View File

@@ -41,6 +41,7 @@
BUILD_DIR="$1" BUILD_DIR="$1"
DESTINATION="$2" DESTINATION="$2"
BUILD_PROFILE="$3"
# #
# Create destination, if it does not yet exist # 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 # 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" mkdir -p "$DESTINATION/radius"
cp extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar "$DESTINATION/radius" cp extensions/guacamole-auth-radius/target/guacamole-auth-radius*.jar "$DESTINATION/radius"
fi fi

2
guacamole-docker/bin/start.sh
View File

@@ -370,7 +370,7 @@ make sure they are readable for the user in the container.
END END
exit 1; exit 1;
fi 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 cat <<END
FATAL: Authentication protocol "eap-ttls" specified but FATAL: Authentication protocol "eap-ttls" specified but
RADIUS_EAP_TTLS_INNER_PROTOCOL is not set! RADIUS_EAP_TTLS_INNER_PROTOCOL is not set!