Skip to content

Commit 494e353

Browse files
authored
Revert "Switch to Chrome for Testing and drop support for Chromium (#824)" (#826)
This reverts commit bdfcc8a. Broke the test build
1 parent bdfcc8a commit 494e353

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

image/discourse_test/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ RUN chown -R discourse . &&\
1717

1818
FROM base AS with_browsers
1919

20-
RUN npx @puppeteer/browsers install chrome@stable &&\
20+
ENV TESTEM_DEFAULT_BROWSER Chromium
21+
ADD install-chrome /tmp/install-chrome
22+
RUN /tmp/install-chrome &&\
2123
apt update &&\
2224
apt install -y libgconf-2-4 libxss1 firefox-esr &&\
2325
cd /tmp && wget -q "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US" -O firefox.tar.bz2 &&\
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# https://googlechromelabs.github.io/chrome-for-testing/ doesn't provide
5+
# linux/arm64 binaries for chrome or chromedriver yet. Therefore on arm64, we
6+
# install chromium instead of chrome.
7+
if [ "$(dpkg --print-architecture)" = "arm64" ]; then
8+
apt update && apt install -y chromium-driver
9+
else
10+
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\
11+
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\
12+
apt update &&\
13+
apt install -y google-chrome-stable chromium-driver
14+
fi

0 commit comments

Comments
 (0)