From 69b5bfec3f7d84568ca12cb4b23b46c0a56cf7a3 Mon Sep 17 00:00:00 2001 From: James Mortensen Date: Sun, 10 Dec 2023 06:22:24 -0600 Subject: [PATCH] Try chromium without usrmerge. Upgrade Firefox to 120 --- NodeChromium/Dockerfile | 2 +- NodeFirefox/Dockerfile.multi-arch | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NodeChromium/Dockerfile b/NodeChromium/Dockerfile index cbafb433f..3fc6406aa 100644 --- a/NodeChromium/Dockerfile +++ b/NodeChromium/Dockerfile @@ -11,7 +11,7 @@ ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 # Deal with the usr merge issues in Debian -RUN apt install usrmerge +#RUN apt install usrmerge # Install Chromium # RUN echo "deb http://http.us.debian.org/debian/ stable non-free contrib main" >> /etc/apt/sources.list \ diff --git a/NodeFirefox/Dockerfile.multi-arch b/NodeFirefox/Dockerfile.multi-arch index ec549e640..ca38d7cb8 100644 --- a/NodeFirefox/Dockerfile.multi-arch +++ b/NodeFirefox/Dockerfile.multi-arch @@ -11,6 +11,9 @@ ARG GECKODRIVER_VERSION=0.33.0 USER root +# Deal with the usr merge issues in Debian +#RUN apt install usrmerge + #========= # Firefox #========= @@ -24,7 +27,7 @@ USER root RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \ && apt-get update -qqy \ && apt-get install libavcodec-extra -y \ - && wget https://snapshot.debian.org/archive/debian/20230924T210045Z/pool/main/f/firefox/firefox_117.0.1-1_`dpkg --print-architecture`.deb -O firefox.deb \ + && wget https://snapshot.debian.org/archive/debian/20231208T150859Z/pool/main/f/firefox/firefox_120.0.1-1_`dpkg --print-architecture`.deb -O firefox.deb \ && apt install ./firefox.deb -y \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* ./firefox.deb