GUACAMOLE-249: Update Docker build to use FreeRDP 2.0.0.
This commit is contained in:
parent
77a32398e5
commit
fa0ad267b8
@ -37,9 +37,9 @@ ARG BUILD_DIR=/tmp/guacd-docker-BUILD
|
|||||||
ARG BUILD_DEPENDENCIES=" \
|
ARG BUILD_DEPENDENCIES=" \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
|
freerdp2-dev \
|
||||||
gcc \
|
gcc \
|
||||||
libcairo2-dev \
|
libcairo2-dev \
|
||||||
libfreerdp-dev \
|
|
||||||
libjpeg62-turbo-dev \
|
libjpeg62-turbo-dev \
|
||||||
libossp-uuid-dev \
|
libossp-uuid-dev \
|
||||||
libpango1.0-dev \
|
libpango1.0-dev \
|
||||||
@ -71,7 +71,7 @@ RUN ${PREFIX_DIR}/bin/build-guacd.sh "$BUILD_DIR" "$PREFIX_DIR"
|
|||||||
RUN ${PREFIX_DIR}/bin/list-dependencies.sh \
|
RUN ${PREFIX_DIR}/bin/list-dependencies.sh \
|
||||||
${PREFIX_DIR}/sbin/guacd \
|
${PREFIX_DIR}/sbin/guacd \
|
||||||
${PREFIX_DIR}/lib/libguac-client-*.so \
|
${PREFIX_DIR}/lib/libguac-client-*.so \
|
||||||
${PREFIX_DIR}/lib/freerdp/guac*.so \
|
${PREFIX_DIR}/lib/freerdp2/guac*.so \
|
||||||
> ${PREFIX_DIR}/DEPENDENCIES
|
> ${PREFIX_DIR}/DEPENDENCIES
|
||||||
|
|
||||||
# Use same Debian as the base for the runtime image
|
# Use same Debian as the base for the runtime image
|
||||||
@ -92,7 +92,6 @@ ENV GUACD_LOG_LEVEL=info
|
|||||||
ARG RUNTIME_DEPENDENCIES=" \
|
ARG RUNTIME_DEPENDENCIES=" \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
ghostscript \
|
ghostscript \
|
||||||
libfreerdp-plugins-standard \
|
|
||||||
fonts-liberation \
|
fonts-liberation \
|
||||||
fonts-dejavu \
|
fonts-dejavu \
|
||||||
xfonts-terminus"
|
xfonts-terminus"
|
||||||
@ -108,7 +107,7 @@ RUN apt-get update && \
|
|||||||
|
|
||||||
# Link FreeRDP plugins into proper path
|
# Link FreeRDP plugins into proper path
|
||||||
RUN ${PREFIX_DIR}/bin/link-freerdp-plugins.sh \
|
RUN ${PREFIX_DIR}/bin/link-freerdp-plugins.sh \
|
||||||
${PREFIX_DIR}/lib/freerdp/guac*.so
|
${PREFIX_DIR}/lib/freerdp2/libguac*.so
|
||||||
|
|
||||||
# Expose the default listener port
|
# Expose the default listener port
|
||||||
EXPOSE 4822
|
EXPOSE 4822
|
||||||
|
@ -70,7 +70,7 @@ while [ -n "$1" ]; do
|
|||||||
|
|
||||||
# Determine correct install location for FreeRDP plugins
|
# Determine correct install location for FreeRDP plugins
|
||||||
FREERDP_DIR="$(where_is_freerdp "$1")"
|
FREERDP_DIR="$(where_is_freerdp "$1")"
|
||||||
FREERDP_PLUGIN_DIR="${FREERDP_DIR}/freerdp"
|
FREERDP_PLUGIN_DIR="${FREERDP_DIR}/freerdp2"
|
||||||
|
|
||||||
# Add symbolic link if necessary
|
# Add symbolic link if necessary
|
||||||
if [ ! -e "$FREERDP_PLUGIN_DIR/$(basename "$1")" ]; then
|
if [ ! -e "$FREERDP_PLUGIN_DIR/$(basename "$1")" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user