Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
# Dockerfile for guacamole-server
#

# The Alpine Linux image that should be used as the basis for the guacd image
# NOTE: Using 3.18 because the required openssl1.1-compat-dev package was
# removed in more recent versions.
# The Alpine Linux image that should be used as the basis for the guacd image.
# NOTE: still pinned to 3.18. Moving to a newer base is a separate, larger
# change (newer Alpine renames packages such as webkit2gtk and ships a CMake
# that rejects the older cmake_minimum_required used by some bundled dependency
# sources), and is out of scope for database protocol support.
ARG ALPINE_BASE_IMAGE=3.18

# The target architecture of the build. Valid values are "ARM" and "X86". By
Expand Down Expand Up @@ -161,7 +163,10 @@ ARG LIBWEBSOCKETS_X86_OPTS=""
FROM alpine:${ALPINE_BASE_IMAGE} AS builder
ARG BUILD_DIR

# Install build dependencies
# Install build dependencies. openssl-dev (OpenSSL 3) replaces the older
# openssl1.1-compat-dev previously used here: the database client libraries
# require it, and the VNC/OpenSSL 3 incompatibility that originally required
# OpenSSL 1.1 (GUACAMOLE-1741) was fixed upstream in LibVNCServer 0.9.15.
RUN apk add --no-cache \
autoconf \
automake \
Expand All @@ -170,15 +175,19 @@ RUN apk add --no-cache \
cjson-dev \
cmake \
cunit-dev \
freetds-dev \
git \
grep \
krb5-dev \
libjpeg-turbo-dev \
libpng-dev \
libpq-dev \
libtool \
libwebp-dev \
make \
openssl1.1-compat-dev \
mariadb-connector-c-dev \
mongo-c-driver-dev \
openssl-dev \
pango-dev \
pulseaudio-dev \
sdl2-dev \
Expand Down
30 changes: 30 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@ DIST_SUBDIRS = \
src/libguac \
src/common \
src/common-ssh \
src/dbshell \
src/terminal \
src/guacd \
src/guacenc \
src/guaclog \
src/pulse \
src/protocols/kubernetes \
src/protocols/mongodb \
src/protocols/mssql \
src/protocols/mysql \
src/protocols/oracle \
src/protocols/postgresql \
src/protocols/rdp \
src/protocols/ssh \
src/protocols/telnet \
Expand All @@ -53,6 +59,10 @@ if ENABLE_TERMINAL
SUBDIRS += src/terminal
endif

if ENABLE_DBSHELL
SUBDIRS += src/dbshell
endif

if ENABLE_PULSE
SUBDIRS += src/pulse
endif
Expand All @@ -61,6 +71,26 @@ if ENABLE_KUBERNETES
SUBDIRS += src/protocols/kubernetes
endif

if ENABLE_MONGODB
SUBDIRS += src/protocols/mongodb
endif

if ENABLE_MSSQL
SUBDIRS += src/protocols/mssql
endif

if ENABLE_MYSQL
SUBDIRS += src/protocols/mysql
endif

if ENABLE_ORACLE
SUBDIRS += src/protocols/oracle
endif

if ENABLE_POSTGRESQL
SUBDIRS += src/protocols/postgresql
endif

if ENABLE_RDP
SUBDIRS += src/protocols/rdp
endif
Expand Down
Loading