From 562ab74006e8731687c7d07f8e2a9bfe748a9578 Mon Sep 17 00:00:00 2001 From: James Mortensen Date: Sun, 10 Dec 2023 06:30:56 -0600 Subject: [PATCH] Add usrmerge to NodeChromium after setting sources. Split Firefox install into 2 runs for easier debugging --- NodeChromium/Dockerfile | 2 +- NodeFirefox/Dockerfile.multi-arch | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NodeChromium/Dockerfile b/NodeChromium/Dockerfile index 3fc6406aa..e067bc9fe 100644 --- a/NodeChromium/Dockerfile +++ b/NodeChromium/Dockerfile @@ -22,7 +22,7 @@ RUN echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list \ # && apt-get -qqy install chromium=93.0.4577.82-1 \ # && apt-get -qqy install chromium=97.0.4692.71-0.1 \ # && apt-get -qqy install chromium=98.0.4758.102-1+b1 \ - && apt-get -qqy install chromium \ + && apt-get -qqy install usrmerge chromium \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* #================================= diff --git a/NodeFirefox/Dockerfile.multi-arch b/NodeFirefox/Dockerfile.multi-arch index ca38d7cb8..19976756e 100644 --- a/NodeFirefox/Dockerfile.multi-arch +++ b/NodeFirefox/Dockerfile.multi-arch @@ -27,8 +27,9 @@ 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/20231208T150859Z/pool/main/f/firefox/firefox_120.0.1-1_`dpkg --print-architecture`.deb -O firefox.deb \ - && apt install ./firefox.deb -y \ + && wget https://snapshot.debian.org/archive/debian/20231208T150859Z/pool/main/f/firefox/firefox_120.0.1-1_`dpkg --print-architecture`.deb -O firefox.deb + +RUN apt install ./firefox.deb -y \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* ./firefox.deb #=============