Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(images): vendor the xtradeb Chromium PPA key instead of fetching it from the keyserver (#4443)

ddupont091c6ee07469
diff --git a/libs/images/bench/web/Dockerfile b/libs/images/bench/web/Dockerfile
index 253389a357..96c3a4e0b5 100644
--- a/libs/images/bench/web/Dockerfile
+++ b/libs/images/bench/web/Dockerfile
@@ -46,10 +46,12 @@ RUN apt-get update \
# Chromium from the xtradeb/apps PPA: only the chromium packages may come from
# it (everything else stays Ubuntu's), at exactly CHROMIUM_VERSION, and the
-# key must have the pinned fingerprint.
-RUN install -d -m 0755 /etc/apt/keyrings \
- && curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${CHROMIUM_PPA_KEY}" \
- | gpg --dearmor >/etc/apt/keyrings/xtradeb-apps.gpg \
+# key must have the pinned fingerprint. The key is vendored
+# (common/apt-keys/xtradeb-apps.asc, shared with libs/images/linux), not
+# fetched from keyserver.ubuntu.com, so a keyserver outage cannot break the build.
+RUN --mount=type=bind,source=common/apt-keys/xtradeb-apps.asc,target=/tmp/xtradeb-apps.asc \
+ install -d -m 0755 /etc/apt/keyrings \
+ && gpg --dearmor </tmp/xtradeb-apps.asc >/etc/apt/keyrings/xtradeb-apps.gpg \
&& gpg --show-keys --with-colons /etc/apt/keyrings/xtradeb-apps.gpg | grep -q "^fpr:::::::::${CHROMIUM_PPA_KEY}:" \
&& echo "deb [signed-by=/etc/apt/keyrings/xtradeb-apps.gpg] https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" \
>/etc/apt/sources.list.d/xtradeb-apps.list \
diff --git a/libs/images/common/apt-keys/xtradeb-apps.asc b/libs/images/common/apt-keys/xtradeb-apps.asc
new file mode 100644
index 0000000000..dd0f98d918
--- /dev/null
+++ b/libs/images/common/apt-keys/xtradeb-apps.asc
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: Hockeypuck 2.2
+Comment: Hostname:
+
+xsFNBF+pJfEBEADmJ5l2tbdD1kDqOCPqPc1QVoDqj0qsQ4byihHacOXZCHhPXnu3
+422//21fi5PvLvb+m2IqhMxXvHMW5XwScEWdNYpD3JhMmZHsk/Oe8b214Z88+LGf
+HoCDyT3fO331vN5fmVpC6AxiszwM9HY/oXfb/VPYZ6nRPyBtU7JPqNtOMLe2RWQo
+WpYGhyCQtn44GQZccw17paQSuC4Y1lY5eb7KpPiPhU8Nm623XnydJd7LNq+MZh+A
+57SXft4oZTclWnYDDWbk0b1L9R1AND9igkI0V00aKs/sj6tVweNS+HsqoSpmwpRt
+/PSC/UZ++KNBnub0Jw2kuO54o3tzeA6sy0Q7Hbz+nFWcI+oxjVofa+TRZSR/3c3R
+ZHnk90GnhVw4lIdVzPvde/rsXhwQMjqdesmW1sM+oOF/Mh9ZUBmyypOd83j4oKyf
+eSQ7E9JEb/kPzpKOkZydnsrjGq/TWNZoaf4U7DJvZ+Y6a2MC55L7en2HuI5HNyFQ
+V2O/IuHUxoINlEuT/oCI0yNg+B8Og5L0+9HOw+YggDLASGpwao8hPOIRgixL9XCU
+Z4CTdPgQLxwAo/1TySO0WKc8rxubSXXydNi4s5iicVRbECbQurLc1Y9ssNXkB4kf
+8KEznGahO1dTEZ+XtIuyXInB3WbxN3bbV6Cs/tUkJ0KuzungEPG4LzpVWQARAQAB
+zSVMYXVuY2hwYWQgUFBBIGZvciB4dHJhZGViIFVidW50dSB0ZWFtwsGOBBMBCgA4
+FiEEUwH6T9kyRPvG9hSZgrtoUcZPaIAFAl+pJfECGwMFCwkIBwIGFQoJCAsCBBYC
+AwECHgECF4AACgkQgrtoUcZPaIBwfRAAvFV6+Ff7zN5Eti/N9XJ7O8lv8UEUUDPp
+rDLiGoSeJQaeay/JYWRg96r2XSkw3tSWeBk/EixR5onOFGK/rT+6QlB9nqug+fQI
+ZpDybTRBYHETAYStkYYDHTBhsPpKnBFilei232Z1C3cMniIGTgtYZYcM3MH92fVd
+/7SCy4tPUvLSdAmzmGQzLX+qEXJO/u3i+4Vc1dbu6GdPeEhXGwQLmlnPmdXbGipa
++Bpd+DB7++xMJMwBoHIT+8Nh9HMguxNycCy6Iz3O29Onl0QYkMnhy6mKl5z/Pqqm
+T9V1K9YZlme11+RSGJMBj6pJkCqh60LjcBxIsN62EMASCTCyyC5syWy5vMpek2Ji
+CjJorm3+WsT8iDJgxaSakXEzfvX8QWMK56hgpAAZFpl6EQm514qEHGKvrR2enwTW
+mRziYjrOdCNk76flVom+1Gns+F21pM6toxxUH4ESE+isvQGpnTLz+hDrqZkoVupn
+CCEnobsyYcT7U9l4DgksWHJZiP7Ht+/VmC87SP0B4ATg1ysHZrpBfV/7ddoyJ+6N
+v1rr9mcSXofUZVYgIG2q0NW9hRObHunWs3gkzjpAQ+Vp6syvCV0BA2QnX1RmImqt
+drCV7If++7t19PUmEjDHzK4QpFbpPmQ0APjkzQ7SP6qQsd6Ftdlu1muhCGOBbUxE
++2FGi8kHKqg=
+=3I/o
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libs/images/linux/Dockerfile b/libs/images/linux/Dockerfile
index 35b800bb29..99bdf1c371 100644
--- a/libs/images/linux/Dockerfile
+++ b/libs/images/linux/Dockerfile
@@ -100,6 +100,8 @@ RUN install -d -m 0755 /etc/apt/keyrings
# Chromium from the xtradeb/apps PPA (open-source build, BSD-3-Clause; not
# Google-branded Chrome): only the chromium packages may come from it, at
# exactly CHROMIUM_VERSION, and the key must have the pinned fingerprint.
+# The key is vendored (common/apt-keys/xtradeb-apps.asc), not fetched from
+# keyserver.ubuntu.com, so a keyserver outage cannot break the build.
# cua-driver's browser_prepare launches /usr/lib/chromium/chromium (a
# root-owned package payload) with a driver-owned throwaway profile. The
# managed policy turns off first-run noise, sign-in and password saving.
@@ -109,8 +111,8 @@ ARG CHROMIUM_VERSION=
ARG CHROMIUM_VERSION_AMD64=154.0.8037.92-1xtradeb1.2404.1
ARG CHROMIUM_VERSION_ARM64=154.0.8037.92-1xtradeb1.2404.1
ARG CHROMIUM_PPA_KEY=5301FA4FD93244FBC6F6149982BB6851C64F6880
-RUN curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${CHROMIUM_PPA_KEY}" \
- | gpg --dearmor >/etc/apt/keyrings/xtradeb-apps.gpg \
+RUN --mount=type=bind,source=common/apt-keys/xtradeb-apps.asc,target=/tmp/xtradeb-apps.asc \
+ gpg --dearmor </tmp/xtradeb-apps.asc >/etc/apt/keyrings/xtradeb-apps.gpg \
&& gpg --show-keys --with-colons /etc/apt/keyrings/xtradeb-apps.gpg | grep -q "^fpr:::::::::${CHROMIUM_PPA_KEY}:" \
&& echo "deb [signed-by=/etc/apt/keyrings/xtradeb-apps.gpg] https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" \
>/etc/apt/sources.list.d/xtradeb-apps.list \