From 494e353c2d9375f296ee0b0debeaa4f29d4e1c20 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Fri, 9 Aug 2024 11:05:25 +0800 Subject: [PATCH] Revert "Switch to Chrome for Testing and drop support for Chromium (#824)" (#826) This reverts commit bdfcc8ad23d9c8a6754de083e9930caa8837d106. Broke the test build --- image/discourse_test/Dockerfile | 4 +++- image/discourse_test/install-chrome | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 image/discourse_test/install-chrome diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 38bfb7c..2bcab2f 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -17,7 +17,9 @@ RUN chown -R discourse . &&\ FROM base AS with_browsers -RUN npx @puppeteer/browsers install chrome@stable &&\ +ENV TESTEM_DEFAULT_BROWSER Chromium +ADD install-chrome /tmp/install-chrome +RUN /tmp/install-chrome &&\ apt update &&\ apt install -y libgconf-2-4 libxss1 firefox-esr &&\ cd /tmp && wget -q "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US" -O firefox.tar.bz2 &&\ diff --git a/image/discourse_test/install-chrome b/image/discourse_test/install-chrome new file mode 100755 index 0000000..8b9d24a --- /dev/null +++ b/image/discourse_test/install-chrome @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +# https://googlechromelabs.github.io/chrome-for-testing/ doesn't provide +# linux/arm64 binaries for chrome or chromedriver yet. Therefore on arm64, we +# install chromium instead of chrome. +if [ "$(dpkg --print-architecture)" = "arm64" ]; then + apt update && apt install -y chromium-driver +else + wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\ + echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\ + apt update &&\ + apt install -y google-chrome-stable chromium-driver +fi -- 2.25.1