penta 1 месяц назад
Родитель
Сommit
0464e5d446
1 измененных файлов с 22 добавлено и 1 удалено
  1. 22 1
      Dockerfile

+ 22 - 1
Dockerfile

@@ -68,7 +68,7 @@ USER root
 RUN dpkg --add-architecture i386 \
     && apt-get update \
     && apt-get install --no-install-recommends -y \
-		btop fonts-noto-cjk fonts-ubuntu mousepad nano ristretto thunar firefox \
+		btop fonts-noto-cjk fonts-ubuntu mousepad nano ristretto thunar \
         ubuntu-wallpapers \
         adwaita-icon-theme \
         elementary-xfce-icon-theme \
@@ -339,6 +339,27 @@ RUN dpkg --add-architecture i386 \
         /var/cache/apt/*
 
 
+# =============================================================================
+# Non-snap Firefox
+# =============================================================================
+
+RUN install -d -m 0755 /etc/apt/keyrings \
+    && curl -fsSL https://packages.mozilla.org/apt/repo-signing-key.gpg \
+       -o /etc/apt/keyrings/packages.mozilla.org.asc \
+    && echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" \
+       > /etc/apt/sources.list.d/mozilla.list \
+    && printf '%s\n' \
+       'Package: *' \
+       'Pin: origin packages.mozilla.org' \
+       'Pin-Priority: 1000' \
+       > /etc/apt/preferences.d/mozilla \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+       firefox \
+       firefox-l10n-fr \
+    && apt-get clean
+
+
 # =============================================================================
 # NVIDIA 32-bit userspace
 #