From 3d4c6c57ac192c368e7df863952eae8b9a37ba8a Mon Sep 17 00:00:00 2001
From: Alex Rudenko <alexrudenko@chromium.org>
Date: Wed, 12 Jun 2024 20:28:41 +0200
Subject: [PATCH] test: try deps list

---
 docker/Dockerfile      |  9 ++++-----
 docker/deb_common.deps | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 docker/deb_common.deps

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7f6256dac2e..3ca42cf5466 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,15 +3,14 @@ FROM node:20@sha256:cb7cd40ba6483f37f791e1aace576df449fc5f75332c19ff59e2c6064797
 # Configure default locale (important for chrome-headless-shell). 
 ENV LANG en_US.UTF-8
 
+COPY deb_common.deps /tmp/deb_common.deps
+
 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
 # Note: this installs the necessary libs to make the bundled version of Chrome that Puppeteer
 # installs, work.
 RUN apt-get update \
-    && apt-get install -y wget gnupg \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor -o /usr/share/keyrings/googlechrome-linux-keyring.gpg \
-    && sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/googlechrome-linux-keyring.gpg] https://dl-ssl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-khmeros fonts-kacst fonts-freefont-ttf libxss1 dbus dbus-x11 \
+    && apt-get satisfy -y "$(cat /tmp/deb_common.deps | tr '\n' ',')" --no-install-recommends  \
+    && apt-get install -y fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-khmeros fonts-kacst fonts-freefont-ttf dbus dbus-x11 \
       --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && groupadd -r pptruser && useradd -rm -g pptruser -G audio,video pptruser
diff --git a/docker/deb_common.deps b/docker/deb_common.deps
new file mode 100644
index 00000000000..24c52949b79
--- /dev/null
+++ b/docker/deb_common.deps
@@ -0,0 +1,31 @@
+ca-certificates
+fonts-liberation
+libasound2 (>= 1.0.17)
+libatk-bridge2.0-0 (>= 2.5.3)
+libatk1.0-0 (>= 2.2.0)
+libatspi2.0-0 (>= 2.9.90)
+libc6 (>= 2.17)
+libcairo2 (>= 1.6.0)
+libcups2 (>= 1.7.0)
+libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3
+libdbus-1-3 (>= 1.9.14)
+libdrm2 (>= 2.4.75)
+libexpat1 (>= 2.1~beta3)
+libgbm1 (>= 17.1.0~rc2)
+libglib2.0-0 (>= 2.39.4)
+libgtk-3-0 (>= 3.9.10) | libgtk-4-1
+libnspr4 (>= 2:4.9-2~)
+libnss3 (>= 2:3.35)
+libpango-1.0-0 (>= 1.14.0)
+libu2f-udev
+libvulkan1
+libx11-6 (>= 2:1.4.99.1)
+libxcb1 (>= 1.9.2)
+libxcomposite1 (>= 1:0.4.4-1)
+libxdamage1 (>= 1:1.1)
+libxext6
+libxfixes3
+libxkbcommon0 (>= 0.5.0)
+libxrandr2
+wget
+xdg-utils (>= 1.0.2)
\ No newline at end of file