From c22afc950d16f2977de30a4770126df0d3b79b99 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Tue, 3 Sep 2024 16:45:21 -0700
Subject: [PATCH] Add jdk 16

---
 java/11/Dockerfile    | 14 +++++++++++---
 java/16/Dockerfile    | 24 ++++++++++++++++++++++++
 java/16/entrypoint.sh | 26 ++++++++++++++++++++++++++
 java/8/Dockerfile     | 14 +++++++++++---
 4 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 java/16/Dockerfile
 create mode 100644 java/16/entrypoint.sh

diff --git a/java/11/Dockerfile b/java/11/Dockerfile
index fde9446..1cd45af 100644
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -1,12 +1,20 @@
-FROM git.zontreck.com/ariascreations/yolks:debian
+FROM eclipse-temurin:11-jdk
+
+LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
+LABEL upstream="https://github.com/pelican-eggs/yolks"
 
 LABEL type="OpenJDK 11"
 
 USER root
 RUN apt-get install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 zip unzip
 
-# Install OpenJDK 8
-RUN apt-get install -y openjdk-11-jdk
+RUN          useradd -m -d /home/container -s /bin/bash container
+ENV          USER=container HOME=/home/container
+
+USER container
+ENV USER=container HOME=/home/container
+
+STOPSIGNAL SIGINT
 
 USER container
 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
new file mode 100644
index 0000000..904ceaa
--- /dev/null
+++ b/java/16/Dockerfile
@@ -0,0 +1,24 @@
+FROM eclipse-temurin:16-jdk
+
+LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
+LABEL upstream="https://github.com/pelican-eggs/yolks"
+
+LABEL type="OpenJDK 16"
+
+USER root
+RUN apt-get install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 zip unzip
+
+RUN          useradd -m -d /home/container -s /bin/bash container
+ENV          USER=container HOME=/home/container
+
+USER container
+ENV USER=container HOME=/home/container
+
+STOPSIGNAL SIGINT
+
+USER container
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/bin/bash", "-c", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/java/16/entrypoint.sh b/java/16/entrypoint.sh
new file mode 100644
index 0000000..5a24865
--- /dev/null
+++ b/java/16/entrypoint.sh
@@ -0,0 +1,26 @@
+
+# Default the TZ environment variable to UTC.
+TZ=${TZ:-UTC}
+export TZ
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
+# Print Java version
+printf "\033[1m\033[33mcontainer@ariaos~ \033[0mjava -version\n"
+java -version
+
+# Convert all of the "{{VARIABLE}}" parts of the command into the expected shell
+# variable format of "${VARIABLE}" before evaluating the string and automatically
+# replacing the values.
+PARSED=$(echo "$STARTUP" | sed -e 's/{{/${/g' -e 's/}}/}/g')
+
+# Display the command we're running in the output, and then execute it with eval
+printf "\033[1m\033[33mcontainer@ariaos~ \033[0m"
+echo "$PARSED"
+# shellcheck disable=SC2086
+eval "$PARSED"
\ No newline at end of file
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
index 05389e1..067780e 100644
--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -1,12 +1,20 @@
-FROM git.zontreck.com/ariascreations/yolks:debian
+FROM eclipse-temurin:8-jdk
+
+LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
+LABEL upstream="https://github.com/pelican-eggs/yolks"
 
 LABEL type="OpenJDK 8"
 
 USER root
 RUN apt-get install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 zip unzip
 
-# Install OpenJDK 8
-RUN apt-get install -y openjdk-8-jdk
+RUN          useradd -m -d /home/container -s /bin/bash container
+ENV          USER=container HOME=/home/container
+
+USER container
+ENV USER=container HOME=/home/container
+
+STOPSIGNAL SIGINT
 
 USER container
 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh