From a62025a07f53f0c8797b7358e3c5bca32db5b2f8 Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Mon, 14 Aug 2023 15:24:24 +0200 Subject: [PATCH] Cleanup java images (#175) Cleanup java images --------- Co-authored-by: gOOvER <116325+gOOvER@users.noreply.github.com> --- java/11/Dockerfile | 16 ++++++++++++++-- java/11j9/Dockerfile | 22 ++++++++++++++++------ java/16/Dockerfile | 16 ++++++++++++++-- java/16j9/Dockerfile | 22 ++++++++++++++++------ java/17/Dockerfile | 18 +++++++++++++++--- java/19/Dockerfile | 18 +++++++++++++++--- java/8/Dockerfile | 16 ++++++++++++++-- java/8j9/Dockerfile | 22 ++++++++++++++++------ 8 files changed, 120 insertions(+), 30 deletions(-) diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 007fca2c2..724efe617 100644 --- 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 index 7c5c67592..7b22dc92c 100644 --- 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 index 2080cf17a..240f4ea55 100644 --- 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 index 9ee4c7d77..8fb09b7fa 100644 --- 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 index 3b8380b6b..bba6eb769 100644 --- a/java/17/Dockerfile +++ b/java/17/Dockerfile @@ -1,4 +1,4 @@ -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" @@ -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/19/Dockerfile b/java/19/Dockerfile index c56508071..733a50b5c 100644 --- a/java/19/Dockerfile +++ b/java/19/Dockerfile @@ -1,4 +1,4 @@ -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" @@ -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/8/Dockerfile b/java/8/Dockerfile index 74c4b6f7c..e09d406dd 100644 --- 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 index 9395fe8f3..968c7d47b 100644 --- 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" ]