|
1 | | -FROM sitespeedio/visualmetrics-deps:ffmpeg-5.1.1-o |
| 1 | +FROM sitespeedio/visualmetrics-deps:ffmpeg-7.1.1 |
2 | 2 |
|
3 | 3 | ARG TARGETPLATFORM |
4 | 4 |
|
5 | | -ENV LC_ALL C |
6 | | -ENV DEBIAN_FRONTEND noninteractive |
7 | | -ENV DEBCONF_NONINTERACTIVE_SEEN true |
| 5 | +ENV LC_ALL=C |
| 6 | +ENV DEBIAN_FRONTEND=noninteractive |
| 7 | +ENV DEBCONF_NONINTERACTIVE_SEEN=true |
8 | 8 |
|
9 | | -ENV FIREFOX_VERSION 144.* |
10 | | -ENV CHROME_VERSION 142.* |
11 | | -ENV EDGE_VERSION 142.* |
| 9 | +ENV FIREFOX_VERSION=144.* |
| 10 | +ENV CHROME_VERSION=142.* |
| 11 | +ENV EDGE_VERSION=142.* |
12 | 12 |
|
13 | 13 | # Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start. |
14 | 14 | # Avoid ERROR: invoke-rc.d: unknown initscript, /etc/init.d/systemd-logind not found. |
@@ -62,23 +62,15 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; \ |
62 | 62 | rm -fR '/usr/bin/firefox' && \ |
63 | 63 | apt remove --purge snapd -y && \ |
64 | 64 | apt autoremove -y && \ |
65 | | - apt-get remove --purge libsnapd-qt1 -y && \ |
66 | | - add-apt-repository ppa:mozillateam/ppa -y && \ |
67 | | - apt-get update && \ |
| 65 | + rm -rf /var/lib/apt/lists/* && \ |
| 66 | + add-apt-repository -y ppa:xtradeb/apps && \ |
| 67 | + apt-get update &&\ |
| 68 | + apt-get install -y --no-install-recommends ungoogled-chromium chromium-driver &&\ |
68 | 69 | apt-get install -y -t 'o=LP-PPA-mozillateam' firefox && \ |
69 | | - add-apt-repository ppa:saiarcot895/chromium-beta && \ |
70 | 70 | apt-get update && \ |
71 | | - wget https://playwright.azureedge.net/builds/chromium/1198/chromium-linux-arm64.zip &&\ |
72 | | - unzip chromium-linux-arm64.zip && \ |
73 | | - rm chromium-linux-arm64.zip && \ |
74 | | - mv chrome-linux /usr/lib/ && \ |
75 | | - apt-get install -y chromium-chromedriver && \ |
76 | | - # Hacking away to get later Chromium version work on ARM |
77 | | - rm /usr/bin/chromium-browser && \ |
78 | | - rm /usr/lib/chromium-browser/chromium-browser && \ |
79 | | - ln -s /usr/lib/chrome-linux/chrome /usr/bin/chromium-browser && \ |
80 | | - ln -s /usr/lib/chrome-linux/chrome /usr/lib/chromium-browser/chromium-browser && \ |
81 | | - ln -s /usr/lib/chromium-browser/chromedriver /usr/local/bin/chromedriver && \ |
| 71 | + ln -s /usr/bin/ungoogled-chromium /usr/local/bin/google-chrome && \ |
| 72 | + ln -s /usr/bin/ungoogled-chromium /usr/local/bin/chromium && \ |
| 73 | + ln -s /usr/bin/ungoogled-chromiumdriver /usr/local/bin/chromedriver && \ |
82 | 74 | apt-get purge -y --auto-remove $buildDeps; \ |
83 | 75 | fi |
84 | 76 | RUN apt-get clean autoclean && \ |
|
0 commit comments