Skip to content

Commit c271b10

Browse files
committed
update dockerfile for compatibility
1 parent 5bb04a1 commit c271b10

File tree

1 file changed

+52
-66
lines changed

1 file changed

+52
-66
lines changed

Dockerfile

+52-66
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ALPINE_BASE_IMAGE=3.18
1+
ARG ALPINE_BASE_IMAGE=3.19
22
ARG TARGETPLATFORM
33
ARG BUILDPLATFORM
44

@@ -14,35 +14,49 @@ ENV \
1414
GUAC_VER=${VERSION}
1515

1616
# Install build dependencies
17-
RUN apk add --no-cache \
18-
alsa-lib-dev \
19-
alsa-tools-dev \
20-
autoconf \
21-
automake \
22-
build-base \
23-
cairo-dev \
24-
cmake \
25-
cups-dev \
26-
faac-dev \
27-
faad2-dev \
28-
ffmpeg4-dev \
29-
git \
30-
grep \
31-
gsm-dev \
32-
gstreamer-dev \
33-
libjpeg-turbo-dev \
34-
libpng-dev \
35-
libtool \
36-
libusb-dev \
37-
libwebp-dev \
38-
libxkbfile-dev \
39-
make \
40-
openh264-dev \
41-
openssl-dev \
42-
pango-dev \
43-
pcsc-lite-dev \
44-
pulseaudio-dev \
45-
util-linux-dev
17+
RUN apk add --no-cache \
18+
alsa-lib-dev \
19+
alsa-tools-dev \
20+
autoconf \
21+
automake \
22+
bsd-compat-headers \
23+
build-base \
24+
cairo-dev \
25+
cmake \
26+
cups-dev \
27+
faac-dev \
28+
faad2-dev \
29+
ffmpeg4-dev \
30+
fuse3-dev \
31+
git \
32+
grep \
33+
gsm-dev \
34+
gst-plugins-base-dev \
35+
gstreamer-dev \
36+
krb5-dev \
37+
libjpeg-turbo-dev \
38+
libpng-dev \
39+
libtool \
40+
libusb-dev \
41+
libwebp-dev \
42+
libxcursor-dev \
43+
libxdamage-dev \
44+
libxi-dev \
45+
libxinerama-dev \
46+
libxkbcommon-dev \
47+
libxkbfile-dev \
48+
libxv-dev \
49+
linux-headers \
50+
make \
51+
openh264-dev \
52+
openssl-dev>3 \
53+
pango-dev \
54+
pcsc-lite-dev \
55+
pulseaudio-dev \
56+
samurai \
57+
uriparser-dev \
58+
util-linux-dev \
59+
wayland-dev
4660

4761

4862
# Copy source to container for sake of build
@@ -76,42 +90,15 @@ ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
7690
#
7791

7892
ARG FREERDP_OPTS_COMMON="\
93+
-DALLOW_IN_SOURCE_BUILD=ON \
7994
-DBUILTIN_CHANNELS=OFF \
80-
-DCHANNEL_URBDRC=OFF \
81-
-DWITH_ALSA=ON \
82-
-DWITH_CAIRO=ON \
83-
-DWITH_CHANNELS=ON \
84-
-DWITH_CLIENT=ON \
85-
-DWITH_CUPS=ON \
86-
-DWITH_DIRECTFB=OFF \
87-
-DWITH_FFMPEG=ON \
88-
-DWITH_GSM=ON \
89-
-DWITH_GSSAPI=OFF \
90-
-DWITH_IPP=OFF \
9195
-DWITH_JPEG=ON \
92-
-DWITH_LIBSYSTEMD=OFF \
93-
-DWITH_MANPAGES=OFF \
9496
-DWITH_OPENH264=ON \
95-
-DWITH_OPENSSL=ON \
96-
-DWITH_OSS=OFF \
97-
-DWITH_PCSC=ON \
98-
-DWITH_PULSE=ON \
99-
-DWITH_SERVER=OFF \
100-
-DWITH_SERVER_INTERFACE=OFF \
101-
-DWITH_SHADOW_MAC=OFF \
102-
-DWITH_SHADOW_X11=OFF \
103-
-DWITH_WAYLAND=OFF \
104-
-DWITH_X11=OFF \
105-
-DWITH_X264=OFF \
106-
-DWITH_XCURSOR=ON \
107-
-DWITH_XEXT=ON \
108-
-DWITH_XI=OFF \
109-
-DWITH_XINERAMA=OFF \
110-
-DWITH_XKBFILE=ON \
111-
-DWITH_XRENDER=OFF \
112-
-DWITH_XTEST=OFF \
113-
-DWITH_XV=OFF \
114-
-DWITH_ZLIB=ON"
97+
-DWITH_GSM=ON \
98+
-DWITH_FAAD2=ON \
99+
-DWITH_FAAC=ON \
100+
-DWITH_GSSAPI=ON \
101+
-DWITH_LIBSYSTEMD=OFF"
115102

116103
ARG GUACAMOLE_SERVER_OPTS="\
117104
--disable-guaclog"
@@ -137,16 +124,15 @@ ARG LIBWEBSOCKETS_OPTS="\
137124
-DLWS_WITH_STATIC=OFF"
138125

139126
# Build guacamole-server and its core protocol library dependencies
140-
RUN echo "$TARGETPLATFORM"
141127
RUN case "${TARGETPLATFORM}" in \
142128
"linux/amd64") \
143129
export FREERDP_OPTS="${FREERDP_OPTS_COMMON} -DWITH_SSE2=ON" \
144130
;; \
145131
"linux/arm64") \
146-
export FREERDP_OPTS="${FREERDP_OPTS_COMMON} -DWITH_NEON=ON" \
132+
export FREERDP_OPTS="${FREERDP_OPTS_COMMON} -DWITH_SSE2=OFF" \
147133
;; \
148134
"linux/ppc64le") \
149-
export FREERDP_OPTS="${FREERDP_OPTS_COMMON} -DWITH_ALTIVEC=ON" \
135+
export FREERDP_OPTS="${FREERDP_OPTS_COMMON} -DWITH_SSE2=OFF" \
150136
;; \
151137
*) \
152138
export FREERDP_OPTS="${FREERDP_OPTS_COMMON}" \

0 commit comments

Comments
 (0)