From 9449b21a03cb5c8b6b1d81b19b83642b6e00c0e7 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 11 Feb 2025 11:40:32 +0000 Subject: [PATCH 1/2] Update firefox tar format Firefox started distributing `.tar.xz` instead of `.tar.bz2` --- image/discourse_test/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index cf07c537c..8bbadaa6c 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -22,10 +22,10 @@ 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 &&\ - tar xjvf firefox.tar.bz2 && mv /tmp/firefox /opt/firefox-evergreen &&\ + cd /tmp && wget -q "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US" -O firefox.tar.xz &&\ + tar xjvf firefox.tar.xz && mv /tmp/firefox /opt/firefox-evergreen &&\ apt clean &&\ - rm /tmp/firefox.tar.bz2 + rm /tmp/firefox.tar.xz FROM with_browsers AS release From f4c003f38ada8729b8ad0501b2d8cc9bf56bd501 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 11 Feb 2025 11:59:18 +0000 Subject: [PATCH 2/2] fixup --- image/discourse_test/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 8bbadaa6c..ce978fd0b 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -23,7 +23,7 @@ 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.xz &&\ - tar xjvf firefox.tar.xz && mv /tmp/firefox /opt/firefox-evergreen &&\ + tar xJvf firefox.tar.xz && mv /tmp/firefox /opt/firefox-evergreen &&\ apt clean &&\ rm /tmp/firefox.tar.xz