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

This commit is contained in:
Michael Jumper 2016-08-26 12:56:41 -07:00
parent 4326029984
commit b6a988fcb1
2 changed files with 60 additions and 50 deletions

View File

@ -27,39 +27,61 @@ MAINTAINER Michael Jumper <mike.jumper@guac-dev.org>
# Environment variables # Environment variables
ENV \ 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=" \
cairo \
dejavu-sans-mono-fonts \
freerdp \
freerdp-plugins \
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 \
libtool \
libtelnet-devel \
libvorbis-devel \
libvncserver-devel \
libwebp-devel \
make \
pango-devel \
pulseaudio-libs-devel \
uuid-devel"
# Bring environment up-to-date, install guacamole-server build dependencies # Bring environment up-to-date and install guacamole-server dependencies
RUN yum -y update i && \ RUN yum -y update && \
yum -y install epel-release && \ yum -y install epel-release && \
yum -y install \ yum -y install $RUNTIME_DEPENDENCIES && \
cairo-devel \
dejavu-sans-mono-fonts \
freerdp-devel \
freerdp-plugins \
gcc \
ghostscript \
libjpeg-turbo-devel \
libssh2-devel \
liberation-mono-fonts \
libtelnet-devel \
libvorbis-devel \
libvncserver-devel \
libwebp-devel \
make \
pango-devel \
pulseaudio-libs-devel \
tar \
terminus-fonts \
uuid-devel && \
yum clean all yum clean all
# Add configuration scripts # 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 # Start guacd, listening on port 0.0.0.0:4822
EXPOSE 4822 EXPOSE 4822

View File

@ -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 ## Locates the directory in which the FreeRDP libraries (.so files) are
## located, printing the result to STDOUT. ## located, printing the result to STDOUT.
## ##
where_is_freerdp() { 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 # Build guacamole-server
# #
cd "$BUILD_DIR/guacamole-server-$VERSION" cd "$BUILD_DIR"
autoreconf -fi
./configure ./configure
make make
make install make install
ldconfig ldconfig
#
# Clean up after build
#
rm -Rf "$BUILD_DIR/guacamole-server-$VERSION"
# #
# Add FreeRDP plugins to proper path # Add FreeRDP plugins to proper path
# #