Fix xpra repository fallback for arm64 Docker builds
Alessandro committed
May 2, 2026 at 21:48 UTC
1a4ef038532b80eed6ed0f8e33180d6fbaebba84
1 file changed
+24
docker/run/fs/ins/install_additional.sh
+24
@@ -40,6 +40,30 @@ install_xpra_repo() {
40
41
apt-get update
42
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget
43
+ configure_xpra_repo "$uri" "$suite" "$arch"
44
+ apt-get update
45
+
46
+ if ! DEBIAN_FRONTEND=noninteractive apt-get install -s --no-install-recommends xpra xpra-x11 xpra-html5 >/tmp/xpra-install-check.log 2>&1; then
47
+ if [ "$arch" != "amd64" ]; then
48
+ echo "xpra packages are not installable from ${uri} ${suite} for ${arch}; falling back to https://xpra.org trixie"
49
+ configure_xpra_repo "https://xpra.org" "trixie" "$arch"
50
+ apt-get update
51
+ if ! DEBIAN_FRONTEND=noninteractive apt-get install -s --no-install-recommends xpra xpra-x11 xpra-html5 >/tmp/xpra-install-check.log 2>&1; then
52
+ cat /tmp/xpra-install-check.log
53
+ exit 1
54
+ fi
55
+ else
56
+ cat /tmp/xpra-install-check.log
57
+ exit 1
58
+ fi
59
+ fi
60
+}
61
+
62
+configure_xpra_repo() {
63
+ local uri="$1"
64
+ local suite="$2"
65
+ local arch="$3"
66
+
67
wget -O /usr/share/keyrings/xpra.asc https://xpra.org/xpra.asc
68
cat >/etc/apt/sources.list.d/xpra.sources <<EOF
69
Types: deb