fix firefox

.gitea/workflows/java.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - master
     paths:
-      - generic/java/**
+      - java/**
       - .gitea/workflows/java.yml
 jobs:
   push:
@@ -18,6 +18,7 @@ jobs:
       matrix:
         tag:
           - 8
+          - 8_with_firefox
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,16 +49,8 @@ jobs:
 
       - uses: docker/build-push-action@v5
         with:
-          context: ./generic/java
-          file: ./generic/java/${{ matrix.tag }}/Dockerfile
+          context: ./java
+          file: ./java/${{ matrix.tag }}/Dockerfile
           push: true
           tags: |
             fascinated/docker-images:java_${{ matrix.tag }}
-
-      - name: Build and Push (Java 8 - With Firefox)
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: ./java8-with-firefox
-          file: ./java8-with-firefox/Dockerfile
-          tags: fascinated/docker-images:java_8_firefox

java/8_with_firefox/Dockerfile

@@ -0,0 +1,35 @@
+# Latest Ubuntu image
+FROM eclipse-temurin:8u392-b08-jdk-focal
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update -y \
+    && apt install -y \
+        curl \
+        lsof \
+        ca-certificates \
+        openssl \
+        git \
+        tar \
+        sqlite3 \
+        fontconfig \
+        tzdata \
+        iproute2 \
+        libfreetype6 \
+        tini \
+        firefox
+
+# Fix for Firefox?
+ENV DISPLAY=:0
+
+RUN         useradd -m -d /home/container -s /bin/bash container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+STOPSIGNAL SIGINT
+
+COPY        --chown=container:container ../entrypoint.sh /entrypoint.sh
+RUN         chmod +x /entrypoint.sh
+ENTRYPOINT  ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]

java8-with-firefox/Dockerfile

@@ -1,5 +0,0 @@
-FROM fascinated/docker-images:java-8
-
-RUN apt update firefox -y
-
-ENV DISPLAY=:0