Cleanup java images (#175)

Cleanup java images --------- Co-authored-by: gOOvER <116325+gOOvER@users.noreply.github.com>
pelican-eggs · Aug 14, 2023 · a62025a · a62025a
1 parent 98585d0
commit a62025a
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 30 deletions.
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
@@ -6,9 +6,21 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
@@ -3,14 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /entrypoint.sh
-
-CMD         ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
@@ -6,9 +6,21 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
@@ -3,14 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /entrypoint.sh
-
-CMD         ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/java/17/Dockerfile b/java/17/Dockerfile
@@ -1,14 +1,26 @@
-FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-focal
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/19/Dockerfile b/java/19/Dockerfile
@@ -1,14 +1,26 @@
-FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-focal
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-jammy
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/8/Dockerfile b/java/8/Dockerfile
@@ -6,9 +6,21 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container

diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
@@ -3,14 +3,24 @@ FROM        --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-8-jdk
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
 RUN         apt update -y \
-						&& apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
-						&& useradd -d /home/container -m container
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
 ENV         USER=container HOME=/home/container
-
 WORKDIR     /home/container
 
-COPY        ./entrypoint.sh /entrypoint.sh
-
-CMD         ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]