Merge pull request #2802 from yueguobin/fix-web-wireshark-docker-xpra6.x

Fix web-wireshark docker build broken by xpra 6.5 release
This commit is contained in:
Jeremy Grossmann 2026-07-06 17:32:31 +02:00 committed by GitHub
commit a0ca8761c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions

View File

@ -15,6 +15,7 @@ RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.aliyun.com/debian|g' /
&& sed -i 's|http://security.debian.org/debian-security|http://mirrors.aliyun.com/debian-security|g' /etc/apt/sources.list.d/debian.sources
# Add xpra official repository
COPY pin-xpra /etc/apt/preferences.d/
RUN apt-get update && apt-get install -y \
ca-certificates \
wget \
@ -24,11 +25,11 @@ RUN apt-get update && apt-get install -y \
&& apt-get update
# Install xpra and dependencies
# Lock xpra version for reproducible builds
# Locking of xpra version is done in /etc/apt/preferences.d/pin-xpra
RUN apt-get install -y \
wireshark-common \
wireshark \
xpra=6.4.3* \
xpra \
xpra-x11 \
xvfb \
curl \

View File

@ -0,0 +1,14 @@
Explanation: Lock Xpra packages to v6.4
Package: xpra*
Pin: version 6.4*
Pin-Priority: 1000
Explanation: xpra-html5 uses different version scheme, lock it to v19
Package: xpra-html5
Pin: version 19*
Pin-Priority: 1000
Explanation: Block the installation of other xpra versions
Package: xpra*
Pin: version *
Pin-Priority: -1