Changed main Dockerfile to use the official build from palemoon.org.

actions: Switched default action back to main GTK2 version.

.github/workflows/dockerimage.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build the Docker image
-        run: docker build . --file Dockerfile.gtk3 --tag vasilev/palemoon
+        run: docker build . --file Dockerfile --tag vasilev/palemoon
 
       - name: Log into registries
         run: | 

Dockerfile

@@ -1,19 +1,20 @@
-# Based on https://github.com/mdouchement/docker-zoom-us
+# Partially based on https://github.com/mdouchement/docker-zoom-us
 FROM ubuntu:22.04
 
-LABEL org.opencontainers.image.source https://github.com/vasilev/docker-image-palemoon
-
-RUN DEBIAN_FRONTEND=noninteractive \
-    && apt update \
-    && apt install -y curl gnupg libpulse0 sudo \
-    && echo 'deb https://download.opensuse.org/repositories/home:/stevenpusser/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/home:stevenpusser.list \
-    && curl -fsSL https://download.opensuse.org/repositories/home:stevenpusser/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_stevenpusser.gpg > /dev/null \
-    && apt update \
-    && apt install --no-install-recommends -y palemoon \
-    && apt remove -y curl gnupg && apt autoremove -y && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+LABEL org.opencontainers.image.source=https://github.com/vasilev/docker-image-palemoon
 
 COPY scripts/ /var/cache/palemoon/
 COPY entrypoint.sh /sbin/entrypoint.sh
-RUN chmod 755 /sbin/entrypoint.sh
+
+RUN export DEBIAN_FRONTEND=noninteractive \
+    && chmod 755 /sbin/entrypoint.sh \
+    && apt-get update \
+    && apt-get install -y  --no-install-recommends libpulse0 sudo wget xz-utils \
+    && apt-get install -y  --no-install-recommends libasound2 libdbus-glib-1-2 libgtk2.0-0 libxrender1 libxt6 \
+    && wget -O /tmp/palemoon.tar.xz 'https://www.palemoon.org/download.php?mirror=us&bits=64&type=linuxgtk2' \
+    && tar -C /usr/local -xf /tmp/palemoon.tar.xz \
+    && update-alternatives --install /usr/bin/palemoon palemoon /usr/local/palemoon/palemoon 80 \
+    && apt-get remove -y wget xz-utils && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 
 ENTRYPOINT ["/sbin/entrypoint.sh"]