Skip to content

Commit d161846

Browse files
vovamodvovamod
authored
Merge pull request #4 from vega-network-main/jdk25
JDK25-pull
2 parents b23f7c1 + 2ce4c4c commit d161846

55 files changed

Lines changed: 624 additions & 972 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: adoptium-build
22

33
on:
44
workflow_dispatch:
5-
#push:
5+
pull_request:
6+
branches:
7+
- main
8+
types:
9+
- closed
610

711
permissions:
812
contents: write
@@ -22,6 +26,8 @@ jobs:
2226
- 17
2327
- 19
2428
- 21
29+
- 24
30+
- 25
2531
steps:
2632
- name: Checkout
2733
uses: actions/checkout@v3
@@ -73,6 +79,8 @@ jobs:
7379
- 17-alpine
7480
- 19-alpine
7581
- 21-alpine
82+
- 24-alpine
83+
- 25-alpine
7684
steps:
7785
- name: Checkout
7886
uses: actions/checkout@v3

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: amazon-corretto-build
22

33
on:
44
workflow_dispatch:
5-
#push:
5+
pull_request:
6+
branches:
7+
- main
8+
types:
9+
- closed
610

711
permissions:
812
contents: write
@@ -23,6 +27,7 @@ jobs:
2327
- 21
2428
- 23
2529
- 24
30+
- 25
2631
steps:
2732
- name: Checkout
2833
uses: actions/checkout@v3
@@ -46,11 +51,9 @@ jobs:
4651
id: meta_corretto
4752
uses: docker/metadata-action@v4
4853
with:
49-
images: |
50-
ghcr.io/${{ github.repository_owner }}/amazon-corretto
51-
tags: |
52-
${{ matrix.tag }}
53-
54+
images: ghcr.io/${{ github.repository_owner }}/amazon-corretto
55+
tags: ${{ matrix.tag }}
56+
5457
- name: Build and push images
5558
uses: docker/build-push-action@v3
5659
with:

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

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

33
on:
44
workflow_dispatch:
5-
#push:
5+
pull_request:
6+
branches:
7+
- main
8+
types:
9+
- closed
610

711
permissions:
812
contents: write
@@ -23,6 +27,7 @@ jobs:
2327
- 21
2428
- 23
2529
- 24
30+
- 25
2631
steps:
2732
- name: Checkout
2833
uses: actions/checkout@v3
@@ -75,6 +80,7 @@ jobs:
7580
- 21-jre
7681
- 23-jre
7782
- 24-jre
83+
- 25-jre
7884
steps:
7985
- name: Checkout
8086
uses: actions/checkout@v3

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: graalvm-ce-build
22

33
on:
44
workflow_dispatch:
5-
#push:
5+
pull_request:
6+
branches:
7+
- main
8+
types:
9+
- closed
610

711
permissions:
812
contents: write

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

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

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# None. Just exist here
2+
3+
.env

‎Adoptium/11-alpine/Dockerfile‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11-jdk-alpine
88
LABEL authors="vovamod <veganetworkmain@gmail.com>,en0tuk <kolobokovich123@gmail.com>"
99

1010
ARG GITHUB_USER
11-
ENV GITHUB_USER ${GITHUB_USER}
1211

13-
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
14-
ENV DEBIAN_FRONTEND=noninteractive
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'
1518

16-
RUN apk update --no-cache \
17-
&& apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2
19+
RUN apk add --no-cache \
20+
bash \
21+
curl \
22+
ca-certificates \
23+
git \
24+
openssl \
25+
tar \
26+
sqlite \
27+
tzdata \
28+
iproute2 \
29+
shadow \
30+
libstdc++ \
31+
fontconfig \
32+
font-dejavu \
33+
font-terminus \
34+
font-noto \
35+
font-awesome && useradd -m -d /home/container container
1836

37+
USER container
38+
ENV USER=container HOME=/home/container
39+
WORKDIR /home/container
1940

20-
RUN adduser -D -h /home/container container
21-
USER container
22-
ENV USER=container HOME=/home/container
23-
WORKDIR /home/container
41+
COPY ./../entrypoint.sh /entrypoint.sh
2442

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

‎Adoptium/11/Dockerfile‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,41 @@
55
# ----------------------------------
66
FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11-jdk-jammy
77

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

1010
ARG GITHUB_USER
11-
ENV GITHUB_USER ${GITHUB_USER}
1211

13-
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
12+
ENV GITHUB_USER=${GITHUB_USER}
13+
ENV LANG='en_US.UTF-8'
14+
ENV LANGUAGE='en_US:en'
15+
ENV LC_ALL='en_US.UTF-8'
16+
ENV TZ='UTC'
17+
# debian_fix
1418
ENV DEBIAN_FRONTEND=noninteractive
1519

16-
RUN apt-get update -y \
17-
&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata locales iproute2
20+
RUN apt-get update && apt-get install --no-install-recommends -y \
21+
bash \
22+
curl \
23+
ca-certificates \
24+
git \
25+
openssl \
26+
tar \
27+
sqlite3 \
28+
tzdata \
29+
locales \
30+
iproute2 \
31+
fontconfig \
32+
fonts-dejavu \
33+
fonts-terminus \
34+
fonts-noto \
35+
fonts-font-awesome \
36+
&& rm -rf /var/lib/apt/lists/* \
37+
&& useradd -d /home/container -m container
1838

39+
USER container
40+
ENV USER=container HOME=/home/container
41+
WORKDIR /home/container
1942

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

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

‎Adoptium/17-alpine/Dockerfile‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,36 @@ FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-alpine
88
LABEL authors="vovamod <veganetworkmain@gmail.com>,en0tuk <kolobokovich123@gmail.com>"
99

1010
ARG GITHUB_USER
11-
ENV GITHUB_USER ${GITHUB_USER}
1211

13-
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
14-
ENV DEBIAN_FRONTEND=noninteractive
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'
1518

16-
RUN apk update --no-cache \
17-
&& apk add bash curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2
19+
RUN apk add --no-cache \
20+
bash \
21+
curl \
22+
ca-certificates \
23+
git \
24+
openssl \
25+
tar \
26+
sqlite \
27+
tzdata \
28+
iproute2 \
29+
shadow \
30+
libstdc++ \
31+
fontconfig \
32+
font-dejavu \
33+
font-terminus \
34+
font-noto \
35+
font-awesome && useradd -m -d /home/container container
1836

37+
USER container
38+
ENV USER=container HOME=/home/container
39+
WORKDIR /home/container
1940

20-
RUN adduser -D -h /home/container container
21-
USER container
22-
ENV USER=container HOME=/home/container
23-
WORKDIR /home/container
41+
COPY ./../entrypoint.sh /entrypoint.sh
2442

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

0 commit comments

Comments
 (0)