Skip to content

Commit a86c334

Browse files
zeke-codeEzechiele Spinatimbru31
authored
feat: add java 25 images (#691)
Co-authored-by: Ezechiele Spina <ezechiele.spina@maggioli.it> Co-authored-by: Tim Brust <github@timbrust.de>
1 parent 244b7dd commit a86c334

File tree

16 files changed

+263
-9
lines changed

16 files changed

+263
-9
lines changed

‎.github/workflows/buildx.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
java-version: [8, 11, 17, 21]
17+
java-version: [8, 11, 17, 21, 25]
1818
java-type: [jdk, jre]
1919
node-version: [20, 22, 24]
2020
variant: [default, alpine]
@@ -49,7 +49,7 @@ jobs:
4949
NODE_CODENAME=${{ steps.nodename.outputs.codename }}
5050
VARIANT="${{ matrix.variant == 'alpine' && '-alpine' || '' }}"
5151
TYPE="${{ matrix.java-type }}"
52-
52+
5353
# Generate tag combinations
5454
if [ "$TYPE" = "jdk" ]; then
5555
TAGS="${DOCKER_IMAGE}:${VERSION}${VARIANT}-jdk-${{ matrix.node-version }}"
@@ -60,7 +60,7 @@ jobs:
6060
TAGS="${TAGS},${DOCKER_IMAGE}:${VERSION}${VARIANT}-jre-${{ matrix.node-version }}"
6161
TAGS="${TAGS},${DOCKER_IMAGE}:${VERSION}${VARIANT}-jre-${NODE_CODENAME}"
6262
fi
63-
63+
6464
echo "docker_image=${DOCKER_IMAGE}" >> $GITHUB_OUTPUT
6565
echo "version=${VERSION}" >> $GITHUB_OUTPUT
6666
echo "tags=${TAGS}" >> $GITHUB_OUTPUT

‎.github/workflows/dockerimage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
java-version: [8, 11, 17, 21]
16+
java-version: [8, 11, 17, 21, 25]
1717
java-type: [jdk, jre]
1818
node-version: [20, 22, 24]
1919
variant: [default, alpine]

‎.github/workflows/hadolint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- run: brew install hadolint
1616

1717
- run: |
18-
hadolint {8,11,17,21}/**/**/*Dockerfile
19-
hadolint {8,11,17,21}/**/**/**/*Dockerfile
18+
hadolint {8,11,17,21,25}/**/**/*Dockerfile
19+
hadolint {8,11,17,21,25}/**/**/**/*Dockerfile

‎25/jdk/20/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM eclipse-temurin:25-jdk
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
ARG NODE_MAJOR=20
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& apt-get update -qq \
13+
&& apt-get install -qq --no-install-recommends \
14+
gpg \
15+
gpg-agent \
16+
curl \
17+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
18+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
19+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
20+
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
21+
&& apt-get update -qq \
22+
&& apt-get install -qq --no-install-recommends \
23+
nodejs \
24+
yarn \
25+
git \
26+
&& apt-get upgrade -qq \
27+
&& rm -rf /var/lib/apt/lists/*

‎25/jdk/20/alpine/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM eclipse-temurin:25-jdk-alpine
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
7+
RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.20/community >> /etc/apk/repositories \
8+
&& echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.20/main >> /etc/apk/repositories \
9+
&& apk -U upgrade \
10+
&& apk add --no-cache \
11+
ada-libs@old-stable \
12+
nodejs@old-stable \
13+
npm@old-stable \
14+
yarn \
15+
curl \
16+
git

‎25/jdk/22/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM eclipse-temurin:25-jdk
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
ARG NODE_MAJOR=22
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& apt-get update -qq \
13+
&& apt-get install -qq --no-install-recommends \
14+
gpg \
15+
gpg-agent \
16+
curl \
17+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
18+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
19+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
20+
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
21+
&& apt-get update -qq \
22+
&& apt-get install -qq --no-install-recommends \
23+
nodejs \
24+
yarn \
25+
git \
26+
&& apt-get upgrade -qq \
27+
&& rm -rf /var/lib/apt/lists/*

‎25/jdk/22/alpine/Dockerfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM eclipse-temurin:25-jdk-alpine
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
7+
RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \
8+
&& echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \
9+
&& apk -U upgrade \
10+
&& apk add --no-cache \
11+
nodejs@new-stable \
12+
npm@new-stable \
13+
yarn \
14+
curl \
15+
git

‎25/jdk/24/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM eclipse-temurin:25-jdk
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
ARG NODE_MAJOR=24
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& apt-get update -qq \
13+
&& apt-get install -qq --no-install-recommends \
14+
gpg \
15+
gpg-agent \
16+
curl \
17+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
18+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
19+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
20+
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
21+
&& apt-get update -qq \
22+
&& apt-get install -qq --no-install-recommends \
23+
nodejs \
24+
yarn \
25+
git \
26+
&& apt-get upgrade -qq \
27+
&& rm -rf /var/lib/apt/lists/*

‎25/jdk/24/alpine/Dockerfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM eclipse-temurin:25-jdk-alpine
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
7+
RUN echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
8+
&& echo @edge https://dl-cdn.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
9+
&& apk -U upgrade \
10+
&& apk add --no-cache \
11+
nodejs-current@edge \
12+
npm@edge \
13+
yarn \
14+
curl \
15+
git

‎25/jre/20/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM eclipse-temurin:25-jre
2+
LABEL maintainer="Tim Brust <github@timbrust.de>"
3+
4+
ARG REFRESHED_AT
5+
ENV REFRESHED_AT=$REFRESHED_AT
6+
ARG NODE_MAJOR=20
7+
8+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
9+
10+
RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \
11+
&& mkdir -p /etc/apt/keyrings \
12+
&& apt-get update -qq \
13+
&& apt-get install -qq --no-install-recommends \
14+
gpg \
15+
gpg-agent \
16+
curl \
17+
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
18+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
19+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
20+
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
21+
&& apt-get update -qq \
22+
&& apt-get install -qq --no-install-recommends \
23+
nodejs \
24+
yarn \
25+
git \
26+
&& apt-get upgrade -qq \
27+
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)