From 9eafaf4b5ebb56addaf10b6b9e6b45ce533081da Mon Sep 17 00:00:00 2001
From: oznu <dev@oz.nu>
Date: Fri, 24 Nov 2017 22:37:41 +1100
Subject: [PATCH] added ldap extension to base - #1

---
 Dockerfile                              |  9 ++++++++-
 root/app/guacamole/guacamole.properties | 10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c129116..c965734 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,9 @@ ENV PG_MAJOR=9.6 \
   POSTGRES_DB=guacamole_db
 
 # Apply the s6-overlay
+
 RUN curl -SLO "https://github.com/just-containers/s6-overlay/releases/download/v1.20.0.0/s6-overlay-amd64.tar.gz" \
-  && tar -xzf s6-overlay-amd64.tar.gz -C / --exclude="./bin" --exclude="./sbin" \
+  && tar -xzf s6-overlay-amd64.tar.gz -C / \
   && tar -xzf s6-overlay-amd64.tar.gz -C /usr ./bin \
   && rm -rf s6-overlay-amd64.tar.gz \
   && mkdir -p ${GUACAMOLE_HOME} \
@@ -50,6 +51,12 @@ RUN rm -rf ${CATALINA_HOME}/webapps/ROOT \
   && cp -R guacamole-auth-jdbc-${GUAC_VER}/postgresql/schema ${GUACAMOLE_HOME}/ \
   && rm -rf guacamole-auth-jdbc-${GUAC_VER} guacamole-auth-jdbc-${GUAC_VER}.tar.gz
 
+# Add optional extensions that don't break the system when not configured
+  RUN curl -SLO "https://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-${GUAC_VER}.tar.gz" \
+    && tar -xzf guacamole-auth-ldap-${GUAC_VER}.tar.gz \
+    && cp guacamole-auth-ldap-${GUAC_VER}/guacamole-auth-ldap-${GUAC_VER}.jar ${GUACAMOLE_HOME}/extensions/ \
+    && rm -rf guacamole-auth-ldap-${GUAC_VER} guacamole-auth-ldap-${GUAC_VER}.tar.gz
+
 ENV PATH=/usr/lib/postgresql/${PG_MAJOR}/bin:$PATH
 ENV GUACAMOLE_HOME=/config/guacamole
 
diff --git a/root/app/guacamole/guacamole.properties b/root/app/guacamole/guacamole.properties
index 8bdde65..ce0bab0 100644
--- a/root/app/guacamole/guacamole.properties
+++ b/root/app/guacamole/guacamole.properties
@@ -4,4 +4,14 @@ postgresql-database: guacamole_db
 postgresql-username: guacamole
 postgresql-password: null
 
+# ldap-hostname: ldap.example.net
+# ldap-port: 389
+# ldap-encryption-method: none
+# ldap-max-search-results: 1000
+# ldap-search-bind-dn:
+# ldap-search-bind-password:
+# ldap-user-base-dn: ou=people,dc=example,dc=net
+# ldap-username-attribute: uid
+# ldap-user-search-filter: (objectClass=*)
+
 enable-clipboard-integration: true