From 80044c77f7b0622bb0d04e3cb162d81c7d97467d Mon Sep 17 00:00:00 2001
From: Jocelyn Le Sage <jocelyn@le-sage.com>
Date: Fri, 9 Dec 2022 13:55:41 -0500
Subject: [PATCH] - Updated Firefox to version 107.0.1-r1. - Updated baseimage
 to version 4.2.1, based on Alpine 3.17.

---
 Dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 94da87d..262a1e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,13 +13,13 @@ RUN gcc -static -o membarrier_check membarrier_check.c
 RUN strip membarrier_check
 
 # Pull base image.
-FROM jlesage/baseimage-gui:alpine-3.16-v4.1.1
+FROM jlesage/baseimage-gui:alpine-3.17-v4.2.1
 
 # Docker image version is provided via build arg.
 ARG DOCKER_IMAGE_VERSION=
 
 # Define software versions.
-ARG FIREFOX_VERSION=101.0.1-r0
+ARG FIREFOX_VERSION=107.0.1-r1
 ARG JSONLZ4_VERSION=c4305b8
 ARG LZ4_VERSION=1.8.1.2
 #ARG PROFILE_CLEANER_VERSION=2.36
@@ -66,16 +66,19 @@ RUN \
 RUN \
     add-pkg \
         # Icons used by folder/file selection window (when saving as).
-        gnome-icon-theme \
+        adwaita-icon-theme \
         # A font is needed.
         ttf-dejavu \
         # The following package is used to send key presses to the X process.
-        xdotool
+        xdotool \
+        && \
+    # Remove unneeded icons.
+    find /usr/share/icons/Adwaita -type d -mindepth 1 -maxdepth 1 -not -name 16x16 -not -name scalable -exec rm -rf {} ';' && \
+    true
 
 # Set default settings.
 RUN \
-    CFG_FILE="$(ls /usr/lib/firefox/browser/defaults/preferences/firefox-branding.js)" && \
-    echo '' >> "$CFG_FILE" && \
+    CFG_FILE="/usr/lib/firefox/browser/defaults/preferences/firefox-branding.js" && \
     echo '// Default download directory.' >> "$CFG_FILE" && \
     echo 'pref("browser.download.dir", "/config/downloads");' >> "$CFG_FILE" && \
     echo 'pref("browser.download.folderList", 2);' >> "$CFG_FILE"