CHANGE: Add firefox-esr, cleanup the dockerfile slightly, and remove openbox and menu.xml.

Dockerfile

@@ -2,7 +2,7 @@
 ARG UBUNTU_VERSION=22.04
 
 FROM nvidia/opengl:1.2-glvnd-runtime-ubuntu${UBUNTU_VERSION}
-LABEL authors="Joshua J. Damanik, vajonam"
+LABEL authors="Joshua J. Damanik - vajonam, Michael Helfrich - helfrichmichael"
 
 ARG VIRTUALGL_VERSION=3.1.1-20240228
 ARG TURBOVNC_VERSION=3.1.1-20240127
@@ -11,24 +11,20 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN 
 # Install some basic dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    wget \
-    xorg \
-    xauth \
-    gosu supervisor x11-xserver-utils \
-    libegl1-mesa \
-    libgl1-mesa-glx \
-    openbox \
-    locales-all libpam0g libxt6 libxext6 dbus-x11 xauth x11-xkb-utils xkb-data python3\
-    xterm \
-    novnc \
+    wget xorg xauth gosu supervisor x11-xserver-utils libegl1-mesa libgl1-mesa-glx \
+    locales-all libpam0g libxt6 libxext6 dbus-x11 xauth x11-xkb-utils xkb-data python3 xterm novnc \
     lxde gtk2-engines-murrine gnome-themes-standard gtk2-engines-pixbuf gtk2-engines-murrine arc-theme \
     freeglut3 libgtk2.0-dev libwxgtk3.0-gtk3-dev libwx-perl libxmu-dev libgl1-mesa-glx libgl1-mesa-dri  \
-    xdg-utils locales locales-all pcmanfm jq curl git bzip2 \
+    xdg-utils locales locales-all pcmanfm jq curl git bzip2 gpg-agent software-properties-common \
+    && mkdir -p /usr/share/desktop-directories \
+    # Install Firefox without Snap.
+    && add-apt-repository ppa:mozillateam/ppa \
+    && apt update \
+    && apt install -y firefox-esr --no-install-recommends \
+    # Clean everything up.
     && apt autoclean -y \
     && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p /usr/share/desktop-directories
-
+    && rm -rf /var/lib/apt/lists/*
 
 # Install virtualgl and turbovnc
 RUN wget -qO /tmp/virtualgl_${VIRTUALGL_VERSION}_amd64.deb https://packagecloud.io/dcommander/virtualgl/packages/any/any/virtualgl_${VIRTUALGL_VERSION}_amd64.deb/download.deb?distro_version_id=35\
@@ -64,7 +60,6 @@ RUN chmod +x /slic3r/get_latest_prusaslicer_release.sh \
   && echo "XDG_DOWNLOAD_DIR=\"/prints/\"" >> /home/slic3r/.config/user-dirs.dirs \
   && echo "file:///prints prints" >> /home/slic3r/.gtk-bookmarks
 
-
 # Generate key for novnc and cleanup erros
 RUN openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/novnc.pem -out /etc/novnc.pem -days 365 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" \
     && rm /etc/xdg/autostart/lxpolkit.desktop \
@@ -73,7 +68,6 @@ RUN openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/novnc.pem -out /etc/n
 ENV PATH ${PATH}:/opt/VirtualGL/bin:/opt/TurboVNC/bin
 
 ADD entrypoint.sh /entrypoint.sh
-ADD menu.xml /etc/xdg/openbox/
 ADD supervisord.conf /etc/
 
 # Add a default file to resize, etc for noVNC.

menu.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openbox_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openbox.org/ file:///usr/share/openbox/menu.xsd">
-    <menu id="root-menu" label="Openbox 3">
-        <item label="Prusaslicer">
-            <action name="Execute">
-                <execute>/usr/bin/vglrun /slic3r/slic3r-dist/prusa-slicer --datadir /configs/.config/PrusaSlicer/</execute>
-            </action>
-        </item>
-        <item label="Terminal">
-            <action name="Execute">
-                <execute>/usr/bin/x-terminal-emulator</execute>
-            </action>
-        </item>
-        <item label="File Explorer">
-            <action name="Execute">
-                <execute>/usr/bin/pcmanfm</execute>
-            </action>
-        </item>
-        <item label="Htop">
-            <action name="Execute">
-                <execute>/usr/bin/x-terminal-emulator -e htop</execute>
-            </action>
-        </item>
-    </menu>
-</openbox_menu>