From 98c097880ef63f48c2b4709450f604f3bbc4a598 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Wed, 29 Nov 2023 19:01:04 +0000
Subject: [PATCH] meow

---
 .gitea/workflows/publish.yaml                 | 16 ++++++---
 generic/java/8/Dockerfile                     | 33 +++++++++++++++++++
 .../java/8}/entrtpoint.sh                     |  0
 java8-with-firefox/Dockerfile                 | 29 ++--------------
 4 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 generic/java/8/Dockerfile
 rename {java8-with-firefox => generic/java/8}/entrtpoint.sh (100%)

diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index 21d28ca..334a75e 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -38,13 +38,21 @@ jobs:
           username: ${{ secrets.REPO_USERNAME }}
           password: ${{ secrets.REPO_TOKEN }}
 
-      - name: Build and Push (Java8 with Firefox)
+      - name: Build and Push (Java 8)
         uses: docker/build-push-action@v4
         with:
           push: true
-          context: ./java8-with-firefox
-          file: ./java8-with-firefox/Dockerfile
-          tags: fascinated/docker-images:node-yarn-latest
+          context: ./generic/java/8
+          file: ./generic/java/8/Dockerfile
+          tags: fascinated/docker-images:java-8
+
+      - name: Build and Push (Java 8 - With Firefox)
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: ./java-8-with-firefox
+          file: ./java-8-with-firefox/Dockerfile
+          tags: fascinated/docker-images:java-8-with-firefox
 
       - name: Build and Push (Latest NodeJS)
         uses: docker/build-push-action@v4
diff --git a/generic/java/8/Dockerfile b/generic/java/8/Dockerfile
new file mode 100644
index 0000000..920d461
--- /dev/null
+++ b/generic/java/8/Dockerfile
@@ -0,0 +1,33 @@
+# Latest Ubuntu image
+FROM eclipse-temurin:8u312-b07-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 \
+
+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"]
\ No newline at end of file
diff --git a/java8-with-firefox/entrtpoint.sh b/generic/java/8/entrtpoint.sh
similarity index 100%
rename from java8-with-firefox/entrtpoint.sh
rename to generic/java/8/entrtpoint.sh
diff --git a/java8-with-firefox/Dockerfile b/java8-with-firefox/Dockerfile
index bf2c62d..d1084ac 100644
--- a/java8-with-firefox/Dockerfile
+++ b/java8-with-firefox/Dockerfile
@@ -1,34 +1,9 @@
 # Latest Ubuntu image
-FROM eclipse-temurin:8u312-b07-jdk-focal
+FROM 
 
 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
 
-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"]
\ No newline at end of file
+ENV DISPLAY=:0
\ No newline at end of file