GUACAMOLE-93: Build guacd-docker using parent guacamole-server source.

src/guacd-docker/Dockerfile

@@ -27,22 +27,34 @@ MAINTAINER Michael Jumper <mike.jumper@guac-dev.org>
 
 # Environment variables
 ENV \
-    GUAC_VERSION=0.9.9 \
+    BUILD_DIR=/tmp/guacd-docker-BUILD \
-    LC_ALL=en_US.UTF-8
+    LC_ALL=en_US.UTF-8                \
-
+    RUNTIME_DEPENDENCIES="            \
-# Bring environment up-to-date, install guacamole-server build dependencies
+        cairo                         \
-RUN yum -y update i             && \
-    yum -y install epel-release && \
-    yum -y install             \
-        cairo-devel            \
         dejavu-sans-mono-fonts        \
-        freerdp-devel          \
+        freerdp                       \
         freerdp-plugins               \
-        gcc                    \
         ghostscript                   \
+        libjpeg-turbo                 \
+        libssh2                       \
+        liberation-mono-fonts         \
+        libtelnet                     \
+        libvorbis                     \
+        libvncserver                  \
+        libwebp                       \
+        pango                         \
+        pulseaudio-libs               \
+        terminus-fonts                \
+        uuid"                         \
+    BUILD_DEPENDENCIES="              \
+        autoconf                      \
+        automake                      \
+        cairo-devel                   \
+        freerdp-devel                 \
+        gcc                           \
         libjpeg-turbo-devel           \
         libssh2-devel                 \
-        liberation-mono-fonts  \
+        libtool                       \
         libtelnet-devel               \
         libvorbis-devel               \
         libvncserver-devel            \
@@ -50,16 +62,26 @@ RUN yum -y update i             && \
         make                          \
         pango-devel                   \
         pulseaudio-libs-devel         \
-        tar                    \
+        uuid-devel"
-        terminus-fonts         \
+
-        uuid-devel              && \
+# Bring environment up-to-date and install guacamole-server dependencies
+RUN yum -y update                        && \
+    yum -y install epel-release          && \
+    yum -y install $RUNTIME_DEPENDENCIES && \
     yum clean all
 
 # Add configuration scripts
-COPY bin /opt/guacd/bin/
+COPY src/guacd-docker/bin /opt/guacd/bin/
 
-# Download and install latest guacamole-server
+# Copy source to container for sake of build
-RUN /opt/guacd/bin/download-guacd.sh "$GUAC_VERSION"
+COPY . "$BUILD_DIR"
+
+# Build guacamole-server from local source
+RUN yum -y install $BUILD_DEPENDENCIES         && \
+    /opt/guacd/bin/build-guacd.sh "$BUILD_DIR" && \
+    rm -Rf "$BUILD_DIR"                        && \
+    yum -y autoremove $BUILD_DEPENDENCIES      && \
+    yum clean all
 
 # Start guacd, listening on port 0.0.0.0:4822
 EXPOSE 4822

src/guacd-docker/bin/build-guacd.sh

@@ -19,49 +19,37 @@
 #
 
 ##
-## @fn download-guacd.sh
+## @fn build-guacd.sh
 ##
-## Downloads and builds the given version of guacamole-server, automatically
+## Builds the source of guacamole-server, automatically creating any required
-## creating any required symbolic links for the proper loading of FreeRDP
+## symbolic links for the proper loading of FreeRDP plugins.
-## plugins.
 ##
-## @param VERSION
+## @param BUILD_DIR
-##     The version of guacamole-server to download, such as "0.9.6".
+##     The directory which currently contains the guacamole-server source and
+##     in which the build should be performed.
 ##
 
-VERSION="$1"
+BUILD_DIR="$1"
-BUILD_DIR="/tmp"
 
 ##
 ## Locates the directory in which the FreeRDP libraries (.so files) are
 ## located, printing the result to STDOUT.
 ##
 where_is_freerdp() {
-    dirname `rpm -ql freerdp-devel | grep 'libfreerdp.*\.so' | head -n1`
+    dirname `rpm -ql freerdp-libs | grep 'libfreerdp.*\.so' | head -n1`
 }
 
-#
-# Download latest guacamole-server
-#
-
-curl -L "http://sourceforge.net/projects/guacamole/files/current/source/guacamole-server-$VERSION.tar.gz" | tar -xz -C "$BUILD_DIR"
-
 #
 # Build guacamole-server
 #
 
-cd "$BUILD_DIR/guacamole-server-$VERSION"
+cd "$BUILD_DIR"
+autoreconf -fi
 ./configure
 make
 make install
 ldconfig
 
-#
-# Clean up after build
-#
-
-rm -Rf "$BUILD_DIR/guacamole-server-$VERSION"
-
 #
 # Add FreeRDP plugins to proper path
 #