mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-10-26 03:42:22 +02:00
Fix web-wireshark docker build broken by xpra 6.5 release
Replace the `xpra=6.4*` version clamp on the apt-get install command line with APT pinning via /etc/apt/preferences.d/pin-xpra. The previous specifier stopped resolving once xpra 6.5 was released: the xpra metapackage was pinned to 6.4 while its sub-packages (xpra-client, xpra-server, xpra-codecs, ...) were unconstrained and defaulted to 6.5, so apt could not satisfy the dependency graph and the "Build Docker images" action failed. Pinning all xpra* packages at the preferences level constrains the whole set consistently (xpra-html5 is handled separately since it follows a different version scheme, locked to v19). Blocking every other version with priority -1 ensures that, if the pinned version ever disappears from the repository, apt fails loudly instead of silently upgrading to the latest release. Fixes GNS3/gns3-registry#1044
This commit is contained in:
parent
58d3055dd3
commit
f5a72532ac
@ -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
|
&& 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
|
# Add xpra official repository
|
||||||
|
COPY pin-xpra /etc/apt/preferences.d/
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
wget \
|
wget \
|
||||||
@ -24,11 +25,11 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& apt-get update
|
&& apt-get update
|
||||||
|
|
||||||
# Install xpra and dependencies
|
# 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 \
|
RUN apt-get install -y \
|
||||||
wireshark-common \
|
wireshark-common \
|
||||||
wireshark \
|
wireshark \
|
||||||
xpra=6.4.3* \
|
xpra \
|
||||||
xpra-x11 \
|
xpra-x11 \
|
||||||
xvfb \
|
xvfb \
|
||||||
curl \
|
curl \
|
||||||
|
|||||||
14
gns3server/agent/web_wireshark/docker/pin-xpra
Normal file
14
gns3server/agent/web_wireshark/docker/pin-xpra
Normal 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
|
||||||
Loading…
x
Reference in New Issue
Block a user