From a4ac58e01aac78cf3d50ab6055dfca277be4355d Mon Sep 17 00:00:00 2001 From: vovamod Date: Tue, 23 Dec 2025 21:07:31 +0100 Subject: [PATCH 1/3] Fixes to Alpine versions of FJP and Java 25 for Corretto (tested on DEBIAN 13 and ARCH 6.16) --- .github/workflows/amazon-corretto-build.yml | 11 +++-- .gitignore | 3 ++ Adoptium/11-alpine/Dockerfile | 39 +++++++++++++----- Adoptium/17-alpine/Dockerfile | 39 +++++++++++++----- Adoptium/19-alpine/Dockerfile | 39 +++++++++++++----- Adoptium/21-alpine/Dockerfile | 39 +++++++++++++----- Adoptium/8-alpine/Dockerfile | 39 +++++++++++++----- Amazon Corretto/11/Dockerfile | 15 +++---- Amazon Corretto/17/Dockerfile | 15 +++---- Amazon Corretto/21/Dockerfile | 15 +++---- Amazon Corretto/23/Dockerfile | 15 +++---- Amazon Corretto/24/Dockerfile | 15 +++---- Amazon Corretto/25/Dockerfile | 45 +++++++++++++++++++++ Amazon Corretto/8/Dockerfile | 15 +++---- Amazon Corretto/README.MD | 5 ++- 15 files changed, 233 insertions(+), 116 deletions(-) create mode 100644 .gitignore create mode 100644 Amazon Corretto/25/Dockerfile diff --git a/.github/workflows/amazon-corretto-build.yml b/.github/workflows/amazon-corretto-build.yml index 37fec8f..9b827b9 100644 --- a/.github/workflows/amazon-corretto-build.yml +++ b/.github/workflows/amazon-corretto-build.yml @@ -2,7 +2,7 @@ name: amazon-corretto-build on: workflow_dispatch: - #push: + push: permissions: contents: write @@ -23,6 +23,7 @@ jobs: - 21 - 23 - 24 + - 25 steps: - name: Checkout uses: actions/checkout@v3 @@ -46,11 +47,9 @@ jobs: id: meta_corretto uses: docker/metadata-action@v4 with: - images: | - ghcr.io/${{ github.repository_owner }}/amazon-corretto - tags: | - ${{ matrix.tag }} - + images: ghcr.io/${{ github.repository_owner }}/amazon-corretto + tags: ${{ matrix.tag }} + - name: Build and push images uses: docker/build-push-action@v3 with: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2edc1ea --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +# None. Just exist here + +.env \ No newline at end of file diff --git a/Adoptium/11-alpine/Dockerfile b/Adoptium/11-alpine/Dockerfile index b03176b..5993315 100644 --- a/Adoptium/11-alpine/Dockerfile +++ b/Adoptium/11-alpine/Dockerfile @@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11-jdk-alpine LABEL authors="vovamod ,en0tuk " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV DEBIAN_FRONTEND=noninteractive +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' -RUN apk update --no-cache \ - && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Adoptium/17-alpine/Dockerfile b/Adoptium/17-alpine/Dockerfile index a8463e0..c90607a 100644 --- a/Adoptium/17-alpine/Dockerfile +++ b/Adoptium/17-alpine/Dockerfile @@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-alpine LABEL authors="vovamod ,en0tuk " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV DEBIAN_FRONTEND=noninteractive +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' -RUN apk update --no-cache \ - && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Adoptium/19-alpine/Dockerfile b/Adoptium/19-alpine/Dockerfile index e0a214e..56ace26 100644 --- a/Adoptium/19-alpine/Dockerfile +++ b/Adoptium/19-alpine/Dockerfile @@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-alpine LABEL authors="vovamod ,en0tuk " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV DEBIAN_FRONTEND=noninteractive +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' -RUN apk update --no-cache \ - && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Adoptium/21-alpine/Dockerfile b/Adoptium/21-alpine/Dockerfile index 13e2f46..e014c71 100644 --- a/Adoptium/21-alpine/Dockerfile +++ b/Adoptium/21-alpine/Dockerfile @@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:21-jdk-alpine LABEL authors="vovamod ,en0tuk " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -ENV DEBIAN_FRONTEND=noninteractive +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' -RUN apk update --no-cache \ - && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/8-alpine/Dockerfile b/Adoptium/8-alpine/Dockerfile index cf195c7..4c0b494 100644 --- a/Adoptium/8-alpine/Dockerfile +++ b/Adoptium/8-alpine/Dockerfile @@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:8-jdk-alpine LABEL authors="vovamod ,en0tuk " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:UTF-8' LC_ALL='en_US.UTF-8' -ENV DEBIAN_FRONTEND=noninteractive +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' -RUN apk update --no-cache \ - && apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN adduser -D -h /home/container container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Amazon Corretto/11/Dockerfile b/Amazon Corretto/11/Dockerfile index 84ee643..a3156eb 100644 --- a/Amazon Corretto/11/Dockerfile +++ b/Amazon Corretto/11/Dockerfile @@ -10,11 +10,11 @@ LABEL authors="vovamod , en0tuk , en0tuk , en0tuk ,en0tuk " +LABEL authors="vovamod " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN useradd -d /home/container -m container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/17/Dockerfile b/Adoptium/17/Dockerfile index 5b6a830..07a0304 100644 --- a/Adoptium/17/Dockerfile +++ b/Adoptium/17/Dockerfile @@ -5,22 +5,41 @@ # ---------------------------------- FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-jammy -LABEL authors="vovamod ,en0tuk " +LABEL authors="vovamod " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN useradd -d /home/container -m container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/19/Dockerfile b/Adoptium/19/Dockerfile index 7ca9ffc..c2f5c81 100644 --- a/Adoptium/19/Dockerfile +++ b/Adoptium/19/Dockerfile @@ -5,22 +5,41 @@ # ---------------------------------- FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-jammy -LABEL authors="vovamod ,en0tuk " +LABEL authors="vovamod " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN useradd -d /home/container -m container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/21/Dockerfile b/Adoptium/21/Dockerfile index 891e10e..30e1ae1 100644 --- a/Adoptium/21/Dockerfile +++ b/Adoptium/21/Dockerfile @@ -5,22 +5,41 @@ # ---------------------------------- FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:21-jdk-jammy -LABEL authors="vovamod ,en0tuk " +LABEL authors="vovamod " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN useradd -d /home/container -m container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/24-alpine/Dockerfile b/Adoptium/24-alpine/Dockerfile new file mode 100644 index 0000000..32fb73e --- /dev/null +++ b/Adoptium/24-alpine/Dockerfile @@ -0,0 +1,43 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java +# Minimum Panel Version: 1.7.0 +# ---------------------------------- +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:24-jdk-alpine + +LABEL authors="vovamod " + +ARG GITHUB_USER + +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' + +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/24/Dockerfile b/Adoptium/24/Dockerfile new file mode 100644 index 0000000..a0caef4 --- /dev/null +++ b/Adoptium/24/Dockerfile @@ -0,0 +1,45 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java +# Minimum Panel Version: 1.7.0 +# ---------------------------------- +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:24-jdk-jammy + +LABEL authors="vovamod " + +ARG GITHUB_USER + +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/25-alpine/Dockerfile b/Adoptium/25-alpine/Dockerfile new file mode 100644 index 0000000..e642f5d --- /dev/null +++ b/Adoptium/25-alpine/Dockerfile @@ -0,0 +1,43 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java +# Minimum Panel Version: 1.7.0 +# ---------------------------------- +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:25-jdk-alpine + +LABEL authors="vovamod " + +ARG GITHUB_USER + +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' + +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/25/Dockerfile b/Adoptium/25/Dockerfile new file mode 100644 index 0000000..fdf951e --- /dev/null +++ b/Adoptium/25/Dockerfile @@ -0,0 +1,45 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java +# Minimum Panel Version: 1.7.0 +# ---------------------------------- +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:25-jdk-jammy + +LABEL authors="vovamod " + +ARG GITHUB_USER + +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/8/Dockerfile b/Adoptium/8/Dockerfile index be07df5..c3dcfe0 100644 --- a/Adoptium/8/Dockerfile +++ b/Adoptium/8/Dockerfile @@ -5,22 +5,41 @@ # ---------------------------------- FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:8-jdk-jammy -LABEL authors="vovamod ,en0tuk " +LABEL authors="vovamod " ARG GITHUB_USER -ENV GITHUB_USER ${GITHUB_USER} -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' +# debian_fix ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -y \ - && apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 +RUN apt-get update && apt-get install --no-install-recommends -y \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite3 \ + tzdata \ + locales \ + iproute2 \ + fontconfig \ + fonts-dejavu \ + fonts-terminus \ + fonts-noto \ + fonts-font-awesome \ + && rm -rf /var/lib/apt/lists/* \ + && useradd -d /home/container -m container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -RUN useradd -d /home/container -m container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container +COPY ./../entrypoint.sh /entrypoint.sh -COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/Adoptium/README.MD b/Adoptium/README.MD index 59c4565..cf550c3 100644 --- a/Adoptium/README.MD +++ b/Adoptium/README.MD @@ -16,9 +16,15 @@ ### [Java 19 | Version: 19.0.2+7](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/19) > ghcr.io/vega-network-main/adoptium:19 -### [Java 21 | Version: 21+35-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/21) +### [Java 21 | Version: 21-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/21) > ghcr.io/vega-network-main/adoptium:21 +### [Java 24 | Version: 24-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/24) +> ghcr.io/vega-network-main/adoptium:24 + +### [Java 25 | Version: 25-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/25) +> ghcr.io/vega-network-main/adoptium:25 + ## Alpine ### [Java 11 | Version: 11.0.21+9-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/11-alpine) @@ -33,5 +39,11 @@ ### [Java 19 | Version: 19.0.2+7](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/19-alpine) > ghcr.io/vega-network-main/adoptium:19-alpine -### [Java 21 | Version: 21+35-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/21-alpine) -> ghcr.io/vega-network-main/adoptium:21-alpine \ No newline at end of file +### [Java 21 | Version: 21-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/21-alpine) +> ghcr.io/vega-network-main/adoptium:21-alpine + +### [Java 24 | Version: 24-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/24-alpine) +> ghcr.io/vega-network-main/adoptium:24-alpine + +### [Java 25 | Version: 25-LTS](https://github.com/vega-network-main/java-docker-images/tree/main/Adoptium/25-alpine) +> ghcr.io/vega-network-main/adoptium:25-alpine \ No newline at end of file diff --git a/Amazon Corretto/25/Dockerfile b/Amazon Corretto/25/Dockerfile index 60b1754..9b898f9 100644 --- a/Amazon Corretto/25/Dockerfile +++ b/Amazon Corretto/25/Dockerfile @@ -41,5 +41,4 @@ WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] - \ No newline at end of file +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Azul Zulu/11-jre/Dockerfile b/Azul Zulu/11-jre/Dockerfile index ddefaf6..8cf5c4b 100644 --- a/Azul Zulu/11-jre/Dockerfile +++ b/Azul Zulu/11-jre/Dockerfile @@ -10,11 +10,11 @@ LABEL authors="vovamod , en0tuk , en0tuk , en0tuk , en0tuk , en0tuk " + +ARG GITHUB_USER + +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' + +# Install required tools with no cache (we want to save space) +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Azul Zulu/25/Dockerfile b/Azul Zulu/25/Dockerfile new file mode 100644 index 0000000..46f537b --- /dev/null +++ b/Azul Zulu/25/Dockerfile @@ -0,0 +1,44 @@ +# ---------------------------------- +# Pterodactyl Core Dockerfile +# Environment: Java +# Minimum Panel Version: 1.7.0 +# ---------------------------------- +FROM --platform=$TARGETOS/$TARGETARCH azul/zulu-openjdk-alpine:25 + +LABEL authors="vovamod " + +ARG GITHUB_USER + +# Fix Docker ENV values +ENV GITHUB_USER=${GITHUB_USER} +ENV LANG='en_US.UTF-8' +ENV LANGUAGE='en_US:en' +ENV LC_ALL='en_US.UTF-8' +ENV TZ='UTC' + +# Install required tools with no cache (we want to save space) +RUN apk add --no-cache \ + bash \ + curl \ + ca-certificates \ + git \ + openssl \ + tar \ + sqlite \ + tzdata \ + iproute2 \ + shadow \ + libstdc++ \ + fontconfig \ + font-dejavu \ + font-terminus \ + font-noto \ + font-awesome && useradd -m -d /home/container container + +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] \ No newline at end of file diff --git a/Azul Zulu/8-jre/Dockerfile b/Azul Zulu/8-jre/Dockerfile index eeedb8a..a618b44 100644 --- a/Azul Zulu/8-jre/Dockerfile +++ b/Azul Zulu/8-jre/Dockerfile @@ -10,11 +10,11 @@ LABEL authors="vovamod , en0tuk ghcr.io/vega-network-main/openjdk:8 - -### [Java 11](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/11) -> ghcr.io/vega-network-main/openjdk:11 - -### [Java 17](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/17) -> ghcr.io/vega-network-main/openjdk:17 - -### [Java 19](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/19) -> ghcr.io/vega-network-main/openjdk:19 - -### [Java 21](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/21) -> ghcr.io/vega-network-main/openjdk:21 - -### [Java 23](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/23) -> ghcr.io/vega-network-main/openjdk:23 - -### [Java 24](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/24) -> ghcr.io/vega-network-main/openjdk:24 - -## JRE - -### [Java 8](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/8-jre) -> ghcr.io/vega-network-main/openjdk:8-jre - -### [Java 11](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/11-jre) -> ghcr.io/vega-network-main/openjdk:11-jre - -### [Java 17](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/17-jre) -> ghcr.io/vega-network-main/openjdk:17-jre - -### [Java 19](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/19-jre) -> ghcr.io/vega-network-main/openjdk:19-jre - -### [Java 21](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/21-jre) -> ghcr.io/vega-network-main/openjdk:21-jre - -### [Java 23](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/23-jre) -> ghcr.io/vega-network-main/openjdk:23-jre - -### [Java 23](https://github.com/vega-network-main/java-docker-images/tree/main/OpenJDK/24-jre) -> ghcr.io/vega-network-main/openjdk:24-jre \ No newline at end of file diff --git a/README.md b/README.md index 5a6bab8..3013dea 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Each vendor has its own folder: * `/Amazon Corretto` - [README](https://github.com/vega-network-main/java-docker-images/blob/main/Amazon%20Corretto/README.MD) * `/Azul Zulu` - [README](https://github.com/vega-network-main/java-docker-images/blob/main/Azul%20Zulu/README.MD) * `/GraalVM` - [README](https://github.com/vega-network-main/java-docker-images/blob/main/GraalVM/README.MD) -* `/OpenJDK` - [README](https://github.com/vega-network-main/java-docker-images/blob/main/OpenJDK/README.MD) +* `/OpenJDK` - [README](https://github.com/vega-network-main/java-docker-images/blob/main/OpenJDK/README.MD) (DEPRECATED - We will not update this image anymore files of it were removed but GHCR images are still available) Inside each: @@ -45,6 +45,7 @@ Inside each: ```dockerfile FROM ghcr.io/vega-network-main/java-docker-images:openjdk-17-jre-alpine +USER container # not always needed COPY my-app.jar /app.jar CMD ["java", "-jar", "/app.jar"] ```