Always use Chromium

wikimedia · Jan 10, 2024 · 3e5e856 · 3e5e856
1 parent 896b82a
commit 3e5e856
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Dockerfile.a11y-regression b/Dockerfile.a11y-regression
@@ -12,13 +12,19 @@ RUN apt-get update && \
 RUN set -ex && \
     DEBIAN_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f2 | tr -d '"') && \
     export DEBIAN_VERSION=$DEBIAN_VERSION && \
+    ARCH=`uname -m` && \
+    if [ "$ARCH" = "x86_64" ]; then \
+           export DEB_ARCH="amd64"; \
+        else \
+           export DEB_ARCH="arm64"; \
+    fi && \
     sudo PUPPETEER_SKIP_DOWNLOAD=true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm install -g --unsafe-perm=true --allow-root pa11y@${PA11Y_VERSION} puppeteer@21.7.0 puppeteer-chromium-version-finder@^1.0.1 chromium-version-deb-finder@^2.0.1 && \
     NODE_PATH="$(npm root -g):$(npm root -g)/puppeteer/node_modules" node -e " \
     const versionFinder = require('puppeteer-chromium-version-finder'); \
     const debFinder = require('chromium-version-deb-finder'); \
     (async () => { \
     const version = await versionFinder.getPuppeteerChromiumVersion(); \
-    const debUrls = await debFinder.getDebUrlsForVersionAndArch(version.MAJOR, version.MINOR, process.env.DEBIAN_VERSION, 'arm64'); \
+    const debUrls = await debFinder.getDebUrlsForVersionAndArch(version.MAJOR, version.MINOR, process.env.DEBIAN_VERSION, process.env.DEB_ARCH); \
     console.log(debUrls.join('\n')); \
     })(); \
     " | \

diff --git a/Dockerfile.visual-regression b/Dockerfile.visual-regression
@@ -12,13 +12,19 @@ RUN apt-get update && \
 RUN set -ex && \
     DEBIAN_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f2 | tr -d '"') && \
     export DEBIAN_VERSION=$DEBIAN_VERSION && \
+    ARCH=`uname -m` && \
+    if [ "$ARCH" = "x86_64" ]; then \
+           export DEB_ARCH="amd64"; \
+        else \
+           export DEB_ARCH="arm64"; \
+    fi && \
     sudo PUPPETEER_SKIP_DOWNLOAD=true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm install -g --unsafe-perm=true --allow-root backstopjs@${BACKSTOPJS_VERSION} puppeteer-chromium-version-finder@^1.0.1 chromium-version-deb-finder@^2.0.1 && \
     NODE_PATH="$(npm root -g):$(npm root -g)/backstopjs/node_modules" node -e " \
       const versionFinder = require('puppeteer-chromium-version-finder'); \
       const debFinder = require('chromium-version-deb-finder'); \
       (async () => { \
         const version = await versionFinder.getPuppeteerChromiumVersion(); \
-        const debUrls = await debFinder.getDebUrlsForVersionAndArch(version.MAJOR, version.MINOR, process.env.DEBIAN_VERSION, 'arm64'); \
+        const debUrls = await debFinder.getDebUrlsForVersionAndArch(version.MAJOR, version.MINOR, process.env.DEBIAN_VERSION, process.env.DEB_ARCH); \
         console.log(debUrls.join('\n')); \
       })(); \
     " | \