Skip to content

Commit 773ae59

Browse files
vovamodvovamod
committed
Updating:
- OpenJDK images - Removing separate alpine images and adding JREs - Updating workflow
1 parent 441d6c8 commit 773ae59

File tree

24 files changed

+608
-191
lines changed

24 files changed

+608
-191
lines changed

‎.github/workflows/adoptium-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: adoptium-build
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
46

57
permissions:
68
contents: write

‎.github/workflows/amazon-corretto-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: amazon-corretto-build
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
46

57
permissions:
68
contents: write

‎.github/workflows/azul-zulu-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: azul-zulu-build
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
46

57
permissions:
68
contents: write

‎.github/workflows/graalvm-ce-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: graalvm-ce-build
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
46

57
permissions:
68
contents: write

‎.github/workflows/openjdk-build.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: openjdk-build
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
46

57
permissions:
68
contents: write
@@ -15,6 +17,7 @@ jobs:
1517
strategy:
1618
matrix:
1719
tag:
20+
- 8
1821
- 11
1922
- 17
2023
- 19
@@ -61,14 +64,19 @@ jobs:
6164
build-args: |
6265
"GITHUB_USER=${{ github.repository_owner }}"
6366
64-
build-alpine:
67+
build-jre:
6568
name: "java-docker-images:openjdk_${{ matrix.tag }}"
6669
runs-on: ubuntu-latest
6770
strategy:
6871
matrix:
6972
tag:
70-
- 17-alpine
71-
- 19-alpine
73+
- 8-jre
74+
- 11-jre
75+
- 17-jre
76+
- 19-jre
77+
- 21-jre
78+
- 23-jre
79+
- 24-jre
7280
steps:
7381
- name: Checkout
7482
uses: actions/checkout@v3

‎GraalVM/23/Dockerfile‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,40 @@
33
# Environment: Java
44
# Minimum Panel Version: 1.7.0
55
# ----------------------------------
6-
FROM ubuntu:22.04
7-
8-
ARG TARGETPLATFORM
9-
ARG GRAAL_VERSION=23.0.1
10-
11-
LABEL authors="vovamod <veganetworkmain@gmail.com>,en0tuk <kolobokovich123@gmail.com>"
12-
13-
ARG GITHUB_USER
14-
ENV GITHUB_USER ${GITHUB_USER}
15-
16-
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
17-
ENV DEBIAN_FRONTEND=noninteractive
18-
19-
RUN apt-get update -y \
20-
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2 \
21-
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
22-
&& locale-gen en_US.UTF-8 \
23-
&& case ${TARGETPLATFORM} in \
24-
"linux/amd64") ARCH=x64 ;; \
25-
"linux/arm64") ARCH=aarch64 ;; \
26-
esac \
27-
&& curl --retry 3 -Lfso /tmp/graalvm.tar.gz https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAAL_VERSION}/graalvm-community-jdk-${GRAAL_VERSION}_linux-${ARCH}_bin.tar.gz \
28-
&& mkdir -p /opt/java/graalvm \
29-
&& cd /opt/java/graalvm \
30-
&& tar -xf /tmp/graalvm.tar.gz --strip-components=1 \
31-
&& export PATH="/opt/java/graalvm/bin:$PATH" \
32-
&& rm -rf /var/lib/apt/lists/* \
33-
&& rm -rf /tmp/graalvm.tar.gz
34-
35-
ENV JAVA_HOME=/opt/java/graalvm \
36-
PATH="/opt/java/graalvm/bin:$PATH"
37-
38-
RUN useradd -d /home/container -m container
39-
40-
USER container
41-
42-
ENV USER=container HOME=/home/container
43-
44-
WORKDIR /home/container
45-
46-
COPY ./../entrypoint.sh /entrypoint.sh
47-
48-
CMD ["/bin/bash", "/entrypoint.sh"]
6+
FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:23-jdk-alpine
7+
8+
LABEL authors="vovamod <veganetworkmain@gmail.com>, en0tuk <kolobokovich123@gmail.com>"
9+
10+
ARG GITHUB_USER
11+
12+
# Fix Docker ENV values
13+
ENV GITHUB_USER ${GITHUB_USER}
14+
ENV LANG 'en_US.UTF-8'
15+
ENV LANGUAGE 'en_US:en'
16+
ENV LC_ALL 'en_US.UTF-8'
17+
ENV TZ UTC
18+
19+
# Install required tools with no cache (we want to save space)
20+
RUN apk add --no-cache \
21+
bash \
22+
curl \
23+
ca-certificates \
24+
git \
25+
openssl \
26+
tar \
27+
sqlite \
28+
fontconfig \
29+
tzdata \
30+
iproute2 \
31+
shadow
32+
33+
34+
RUN useradd -m -d /home/container container
35+
36+
USER container
37+
ENV USER=container HOME=/home/container
38+
WORKDIR /home/container
39+
40+
COPY ./../entrypoint.sh /entrypoint.sh
41+
42+
CMD ["/bin/bash", "/entrypoint.sh"]

‎OpenJDK/11-jre/Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# ----------------------------------
2+
# Pterodactyl Core Dockerfile
3+
# Environment: Java
4+
# Minimum Panel Version: 1.7.0
5+
# ----------------------------------
6+
FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11-jre-alpine
7+
8+
LABEL authors="vovamod <veganetworkmain@gmail.com>, en0tuk <kolobokovich123@gmail.com>"
9+
10+
ARG GITHUB_USER
11+
12+
# Fix Docker ENV values
13+
ENV GITHUB_USER ${GITHUB_USER}
14+
ENV LANG 'en_US.UTF-8'
15+
ENV LANGUAGE 'en_US:en'
16+
ENV LC_ALL 'en_US.UTF-8'
17+
ENV TZ UTC
18+
19+
# Install required tools with no cache (we want to save space)
20+
RUN apk add --no-cache \
21+
bash \
22+
curl \
23+
ca-certificates \
24+
git \
25+
openssl \
26+
tar \
27+
sqlite \
28+
fontconfig \
29+
tzdata \
30+
iproute2 \
31+
shadow
32+
33+
34+
RUN useradd -m -d /home/container container
35+
36+
USER container
37+
ENV USER=container HOME=/home/container
38+
WORKDIR /home/container
39+
40+
COPY ./../entrypoint.sh /entrypoint.sh
41+
42+
CMD ["/bin/bash", "/entrypoint.sh"]

‎OpenJDK/11/Dockerfile‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,40 @@
33
# Environment: Java
44
# Minimum Panel Version: 1.7.0
55
# ----------------------------------
6-
FROM --platform=$TARGETOS/$TARGETARCH openjdk:11-jdk-slim-bullseye
6+
FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11-jdk-alpine
77

8-
LABEL authors="vovamod <veganetworkmain@gmail.com>,en0tuk <kolobokovich123@gmail.com>"
8+
LABEL authors="vovamod <veganetworkmain@gmail.com>, en0tuk <kolobokovich123@gmail.com>"
99

1010
ARG GITHUB_USER
11+
12+
# Fix Docker ENV values
1113
ENV GITHUB_USER ${GITHUB_USER}
14+
ENV LANG 'en_US.UTF-8'
15+
ENV LANGUAGE 'en_US:en'
16+
ENV LC_ALL 'en_US.UTF-8'
17+
ENV TZ UTC
18+
19+
# Install required tools with no cache (we want to save space)
20+
RUN apk add --no-cache \
21+
bash \
22+
curl \
23+
ca-certificates \
24+
git \
25+
openssl \
26+
tar \
27+
sqlite \
28+
fontconfig \
29+
tzdata \
30+
iproute2 \
31+
shadow
1232

13-
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
14-
ENV DEBIAN_FRONTEND=noninteractive
1533

16-
RUN apt-get update -y
17-
RUN apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2
34+
RUN useradd -m -d /home/container container
1835

36+
USER container
37+
ENV USER=container HOME=/home/container
38+
WORKDIR /home/container
1939

20-
RUN useradd -d /home/container -m container
21-
USER container
22-
ENV USER=container HOME=/home/container
23-
WORKDIR /home/container
40+
COPY ./../entrypoint.sh /entrypoint.sh
2441

25-
COPY ./../entrypoint.sh /entrypoint.sh
26-
CMD ["/bin/bash", "/entrypoint.sh"]
42+
CMD ["/bin/bash", "/entrypoint.sh"]

‎OpenJDK/17-alpine/Dockerfile‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎OpenJDK/17-jre/Dockerfile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# ----------------------------------
2+
# Pterodactyl Core Dockerfile
3+
# Environment: Java
4+
# Minimum Panel Version: 1.7.0
5+
# ----------------------------------
6+
FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jre-alpine
7+
8+
LABEL authors="vovamod <veganetworkmain@gmail.com>, en0tuk <kolobokovich123@gmail.com>"
9+
10+
ARG GITHUB_USER
11+
12+
# Fix Docker ENV values
13+
ENV GITHUB_USER ${GITHUB_USER}
14+
ENV LANG 'en_US.UTF-8'
15+
ENV LANGUAGE 'en_US:en'
16+
ENV LC_ALL 'en_US.UTF-8'
17+
ENV TZ UTC
18+
19+
# Install required tools with no cache (we want to save space)
20+
RUN apk add --no-cache \
21+
bash \
22+
curl \
23+
ca-certificates \
24+
git \
25+
openssl \
26+
tar \
27+
sqlite \
28+
fontconfig \
29+
tzdata \
30+
iproute2 \
31+
shadow
32+
33+
34+
RUN useradd -m -d /home/container container
35+
36+
USER container
37+
ENV USER=container HOME=/home/container
38+
WORKDIR /home/container
39+
40+
COPY ./../entrypoint.sh /entrypoint.sh
41+
42+
CMD ["/bin/bash", "/entrypoint.sh"]

0 commit comments

Comments
 (0)