From dd7c5f05678d148d72e81b46cb9da91d13534d32 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Thu, 26 Dec 2024 14:40:03 +0100 Subject: [PATCH] Update docker test image (#388) --- test/docker/Dockerfile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 568e17b6..83790a25 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -1,10 +1,8 @@ -FROM ubuntu:22.04 +FROM --platform=linux/amd64 ubuntu:24.04 -ENV FIREFOX_VERSION="120.0" -ENV CHROME_VERSION="119.0.6045.159-1" +ENV FIREFOX_VERSION="133.0" ENV PHANTOMJS_VERSION="2.1.1" -ENV GECKODRIVER_VERSION="0.33.0" -ENV CHROMEDRIVER_VERSION="119.0.6045.105" +ENV GECKODRIVER_VERSION="0.35.0" ENV INSTALL="apt-get install -y --no-install-recommends" @@ -14,7 +12,7 @@ RUN apt-get update RUN $INSTALL wget ca-certificates bzip2 unzip # firefox setup -RUN $INSTALL libgtk-3-0 libasound2 libx11-xcb1 +RUN $INSTALL libgtk-3-0t64 libasound2t64 libx11-xcb1 RUN wget https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 && \ tar -xf firefox-${FIREFOX_VERSION}.tar.bz2 && \ @@ -33,21 +31,12 @@ RUN wget https://github.com/mozilla/geckodriver/releases/download/v${GECKODRIVER RUN geckodriver --version # chrome setup -RUN wget https://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb && \ - $INSTALL ./google-chrome-stable_${CHROME_VERSION}_amd64.deb && \ - rm google-chrome-stable_${CHROME_VERSION}_amd64.deb +RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \ + $INSTALL ./google-chrome-stable_current_amd64.deb && \ + rm google-chrome-stable_current_amd64.deb RUN google-chrome --version -# chromedirver setup -RUN wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip && \ - unzip chromedriver-linux64.zip && \ - mv chromedriver-linux64/chromedriver /usr/local/bin && \ - rm -rf chromedriver-linux64 && \ - rm chromedriver-linux64.zip - -RUN geckodriver --version - # phantomjs setup RUN $INSTALL build-essential chrpath libssl-dev libxft-dev \ libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev @@ -66,6 +55,6 @@ RUN phantomjs --version # install python dependencies ADD requirements.txt . RUN $INSTALL python3 python3-pip && \ - pip install --upgrade pip && \ + pip config set global.break-system-packages true && \ pip install -r requirements.txt && \ - rm requirements.txt + rm requirements.txt \