From e9fc233c83af995c3155b35da34d56c812d61056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Pr=C3=BCssing?= Date: Sat, 19 Sep 2026 14:16:27 +0200 Subject: [PATCH] feat: add support for Node.js 26 (Lithium) --- .github/workflows/buildx.yml | 2 +- .github/workflows/dockerimage.yml | 2 +- 11/jdk/22/alpine/Dockerfile | 10 +++++----- 11/jdk/24/alpine/Dockerfile | 2 +- 11/jdk/26/Dockerfile | 26 ++++++++++++++++++++++++++ 11/jdk/26/alpine/Dockerfile | 13 +++++++++++++ 11/jre/22/alpine/Dockerfile | 10 +++++----- 11/jre/24/alpine/Dockerfile | 2 +- 11/jre/26/Dockerfile | 26 ++++++++++++++++++++++++++ 11/jre/26/alpine/Dockerfile | 14 ++++++++++++++ 17/jdk/22/alpine/Dockerfile | 10 +++++----- 17/jdk/24/alpine/Dockerfile | 2 +- 17/jdk/26/Dockerfile | 26 ++++++++++++++++++++++++++ 17/jdk/26/alpine/Dockerfile | 13 +++++++++++++ 17/jre/22/alpine/Dockerfile | 10 +++++----- 17/jre/24/alpine/Dockerfile | 2 +- 17/jre/26/Dockerfile | 26 ++++++++++++++++++++++++++ 17/jre/26/alpine/Dockerfile | 13 +++++++++++++ 21/jdk/22/alpine/Dockerfile | 10 +++++----- 21/jdk/24/alpine/Dockerfile | 2 +- 21/jdk/26/Dockerfile | 26 ++++++++++++++++++++++++++ 21/jdk/26/alpine/Dockerfile | 13 +++++++++++++ 21/jre/22/alpine/Dockerfile | 10 +++++----- 21/jre/24/alpine/Dockerfile | 2 +- 21/jre/26/Dockerfile | 26 ++++++++++++++++++++++++++ 21/jre/26/alpine/Dockerfile | 13 +++++++++++++ 25/jdk/22/alpine/Dockerfile | 10 +++++----- 25/jdk/24/alpine/Dockerfile | 2 +- 25/jdk/26/Dockerfile | 27 +++++++++++++++++++++++++++ 25/jdk/26/alpine/Dockerfile | 13 +++++++++++++ 25/jre/22/alpine/Dockerfile | 10 +++++----- 25/jre/24/alpine/Dockerfile | 2 +- 25/jre/26/Dockerfile | 27 +++++++++++++++++++++++++++ 25/jre/26/alpine/Dockerfile | 14 ++++++++++++++ 8/jdk/22/alpine/Dockerfile | 10 +++++----- 8/jdk/24/alpine/Dockerfile | 2 +- 8/jdk/26/Dockerfile | 26 ++++++++++++++++++++++++++ 8/jdk/26/alpine/Dockerfile | 13 +++++++++++++ 8/jre/22/alpine/Dockerfile | 10 +++++----- 8/jre/24/alpine/Dockerfile | 2 +- 8/jre/26/Dockerfile | 26 ++++++++++++++++++++++++++ 8/jre/26/alpine/Dockerfile | 13 +++++++++++++ README.md | 6 +++--- 43 files changed, 459 insertions(+), 65 deletions(-) create mode 100644 11/jdk/26/Dockerfile create mode 100644 11/jdk/26/alpine/Dockerfile create mode 100644 11/jre/26/Dockerfile create mode 100644 11/jre/26/alpine/Dockerfile create mode 100644 17/jdk/26/Dockerfile create mode 100644 17/jdk/26/alpine/Dockerfile create mode 100644 17/jre/26/Dockerfile create mode 100644 17/jre/26/alpine/Dockerfile create mode 100644 21/jdk/26/Dockerfile create mode 100644 21/jdk/26/alpine/Dockerfile create mode 100644 21/jre/26/Dockerfile create mode 100644 21/jre/26/alpine/Dockerfile create mode 100644 25/jdk/26/Dockerfile create mode 100644 25/jdk/26/alpine/Dockerfile create mode 100644 25/jre/26/Dockerfile create mode 100644 25/jre/26/alpine/Dockerfile create mode 100644 8/jdk/26/Dockerfile create mode 100644 8/jdk/26/alpine/Dockerfile create mode 100644 8/jre/26/Dockerfile create mode 100644 8/jre/26/alpine/Dockerfile diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 32cfdb9..4a3b7a1 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -16,7 +16,7 @@ jobs: matrix: java-version: [8, 11, 17, 21, 25] java-type: [jdk, jre] - node-version: [22, 24] + node-version: [22, 24, 26] variant: [default, alpine] include: - variant: default diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 1331a44..b71099a 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -15,7 +15,7 @@ jobs: matrix: java-version: [8, 11, 17, 21, 25] java-type: [jdk, jre] - node-version: [22, 24] + node-version: [22, 24, 26] variant: [default, alpine] steps: - uses: actions/checkout@v7.0.1 diff --git a/11/jdk/22/alpine/Dockerfile b/11/jdk/22/alpine/Dockerfile index a07be56..d76b511 100644 --- a/11/jdk/22/alpine/Dockerfile +++ b/11/jdk/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:11-jdk-alpine-3.23 +FROM eclipse-temurin:11-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/11/jdk/24/alpine/Dockerfile b/11/jdk/24/alpine/Dockerfile index 1922253..d440452 100644 --- a/11/jdk/24/alpine/Dockerfile +++ b/11/jdk/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jdk-alpine-3.23 +FROM eclipse-temurin:11-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/11/jdk/26/Dockerfile b/11/jdk/26/Dockerfile new file mode 100644 index 0000000..55eb7c6 --- /dev/null +++ b/11/jdk/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:11-jdk +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/11/jdk/26/alpine/Dockerfile b/11/jdk/26/alpine/Dockerfile new file mode 100644 index 0000000..979df33 --- /dev/null +++ b/11/jdk/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:11-jdk-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/11/jre/22/alpine/Dockerfile b/11/jre/22/alpine/Dockerfile index 1c5e404..37f730c 100644 --- a/11/jre/22/alpine/Dockerfile +++ b/11/jre/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:11-jre-alpine-3.23 +FROM eclipse-temurin:11-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/11/jre/24/alpine/Dockerfile b/11/jre/24/alpine/Dockerfile index cdaa4e8..d4aa45e 100644 --- a/11/jre/24/alpine/Dockerfile +++ b/11/jre/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jre-alpine-3.23 +FROM eclipse-temurin:11-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/11/jre/26/Dockerfile b/11/jre/26/Dockerfile new file mode 100644 index 0000000..c1eeeab --- /dev/null +++ b/11/jre/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:11-jre +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/11/jre/26/alpine/Dockerfile b/11/jre/26/alpine/Dockerfile new file mode 100644 index 0000000..eb357aa --- /dev/null +++ b/11/jre/26/alpine/Dockerfile @@ -0,0 +1,14 @@ +FROM eclipse-temurin:11-jre-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git + diff --git a/17/jdk/22/alpine/Dockerfile b/17/jdk/22/alpine/Dockerfile index 717bc6b..eee513e 100644 --- a/17/jdk/22/alpine/Dockerfile +++ b/17/jdk/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:17-jdk-alpine-3.23 +FROM eclipse-temurin:17-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/17/jdk/24/alpine/Dockerfile b/17/jdk/24/alpine/Dockerfile index 8c13509..722eb03 100644 --- a/17/jdk/24/alpine/Dockerfile +++ b/17/jdk/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jdk-alpine-3.23 +FROM eclipse-temurin:17-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/17/jdk/26/Dockerfile b/17/jdk/26/Dockerfile new file mode 100644 index 0000000..e7a66b8 --- /dev/null +++ b/17/jdk/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:17-jdk +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/17/jdk/26/alpine/Dockerfile b/17/jdk/26/alpine/Dockerfile new file mode 100644 index 0000000..b851ad0 --- /dev/null +++ b/17/jdk/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:17-jdk-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/17/jre/22/alpine/Dockerfile b/17/jre/22/alpine/Dockerfile index fdcfb11..88f5f8e 100644 --- a/17/jre/22/alpine/Dockerfile +++ b/17/jre/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:17-jre-alpine-3.23 +FROM eclipse-temurin:17-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/17/jre/24/alpine/Dockerfile b/17/jre/24/alpine/Dockerfile index 7f1e482..11d7819 100644 --- a/17/jre/24/alpine/Dockerfile +++ b/17/jre/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jre-alpine-3.23 +FROM eclipse-temurin:17-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/17/jre/26/Dockerfile b/17/jre/26/Dockerfile new file mode 100644 index 0000000..498e5bc --- /dev/null +++ b/17/jre/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:17-jre +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/17/jre/26/alpine/Dockerfile b/17/jre/26/alpine/Dockerfile new file mode 100644 index 0000000..61225c6 --- /dev/null +++ b/17/jre/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:17-jre-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/21/jdk/22/alpine/Dockerfile b/21/jdk/22/alpine/Dockerfile index 3d70089..722eb9e 100644 --- a/21/jdk/22/alpine/Dockerfile +++ b/21/jdk/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:21-jdk-alpine-3.23 +FROM eclipse-temurin:21-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/21/jdk/24/alpine/Dockerfile b/21/jdk/24/alpine/Dockerfile index acf8c69..ad80b6e 100644 --- a/21/jdk/24/alpine/Dockerfile +++ b/21/jdk/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-jdk-alpine-3.23 +FROM eclipse-temurin:21-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/21/jdk/26/Dockerfile b/21/jdk/26/Dockerfile new file mode 100644 index 0000000..f0376b8 --- /dev/null +++ b/21/jdk/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:21-jdk +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/21/jdk/26/alpine/Dockerfile b/21/jdk/26/alpine/Dockerfile new file mode 100644 index 0000000..e993ca2 --- /dev/null +++ b/21/jdk/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:21-jdk-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/21/jre/22/alpine/Dockerfile b/21/jre/22/alpine/Dockerfile index e0f3e16..d216d48 100644 --- a/21/jre/22/alpine/Dockerfile +++ b/21/jre/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:21-jre-alpine-3.23 +FROM eclipse-temurin:21-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/21/jre/24/alpine/Dockerfile b/21/jre/24/alpine/Dockerfile index ed79ea6..49aff05 100644 --- a/21/jre/24/alpine/Dockerfile +++ b/21/jre/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-jre-alpine-3.23 +FROM eclipse-temurin:21-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/21/jre/26/Dockerfile b/21/jre/26/Dockerfile new file mode 100644 index 0000000..09a830c --- /dev/null +++ b/21/jre/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:21-jre +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/21/jre/26/alpine/Dockerfile b/21/jre/26/alpine/Dockerfile new file mode 100644 index 0000000..8978d4a --- /dev/null +++ b/21/jre/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:21-jre-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/25/jdk/22/alpine/Dockerfile b/25/jdk/22/alpine/Dockerfile index a24b9f4..2d309c7 100644 --- a/25/jdk/22/alpine/Dockerfile +++ b/25/jdk/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:25-jdk-alpine-3.23 +FROM eclipse-temurin:25-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/25/jdk/24/alpine/Dockerfile b/25/jdk/24/alpine/Dockerfile index 60fe246..b74f623 100644 --- a/25/jdk/24/alpine/Dockerfile +++ b/25/jdk/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25-jdk-alpine-3.23 +FROM eclipse-temurin:25-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/25/jdk/26/Dockerfile b/25/jdk/26/Dockerfile new file mode 100644 index 0000000..5c9e278 --- /dev/null +++ b/25/jdk/26/Dockerfile @@ -0,0 +1,27 @@ +FROM eclipse-temurin:25-jdk +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + curl \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/25/jdk/26/alpine/Dockerfile b/25/jdk/26/alpine/Dockerfile new file mode 100644 index 0000000..03c52e0 --- /dev/null +++ b/25/jdk/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:25-jdk-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/25/jre/22/alpine/Dockerfile b/25/jre/22/alpine/Dockerfile index 2c54568..e211dd8 100644 --- a/25/jre/22/alpine/Dockerfile +++ b/25/jre/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:25-jre-alpine-3.23 +FROM eclipse-temurin:25-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/25/jre/24/alpine/Dockerfile b/25/jre/24/alpine/Dockerfile index 4950670..7b7b732 100644 --- a/25/jre/24/alpine/Dockerfile +++ b/25/jre/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25-jre-alpine-3.23 +FROM eclipse-temurin:25-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/25/jre/26/Dockerfile b/25/jre/26/Dockerfile new file mode 100644 index 0000000..c3b1f77 --- /dev/null +++ b/25/jre/26/Dockerfile @@ -0,0 +1,27 @@ +FROM eclipse-temurin:25-jre +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + curl \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/25/jre/26/alpine/Dockerfile b/25/jre/26/alpine/Dockerfile new file mode 100644 index 0000000..083233f --- /dev/null +++ b/25/jre/26/alpine/Dockerfile @@ -0,0 +1,14 @@ +FROM eclipse-temurin:25-jre-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git + diff --git a/8/jdk/22/alpine/Dockerfile b/8/jdk/22/alpine/Dockerfile index 615ef4b..db71b84 100644 --- a/8/jdk/22/alpine/Dockerfile +++ b/8/jdk/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:8-jdk-alpine-3.23 +FROM eclipse-temurin:8-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/8/jdk/24/alpine/Dockerfile b/8/jdk/24/alpine/Dockerfile index e43bd57..91f4fc5 100644 --- a/8/jdk/24/alpine/Dockerfile +++ b/8/jdk/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:8-jdk-alpine-3.23 +FROM eclipse-temurin:8-jdk-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/8/jdk/26/Dockerfile b/8/jdk/26/Dockerfile new file mode 100644 index 0000000..e0b1ab3 --- /dev/null +++ b/8/jdk/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:8-jdk +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/8/jdk/26/alpine/Dockerfile b/8/jdk/26/alpine/Dockerfile new file mode 100644 index 0000000..8072976 --- /dev/null +++ b/8/jdk/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:8-jdk-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/8/jre/22/alpine/Dockerfile b/8/jre/22/alpine/Dockerfile index b31cc79..1152775 100644 --- a/8/jre/22/alpine/Dockerfile +++ b/8/jre/22/alpine/Dockerfile @@ -1,15 +1,15 @@ -FROM eclipse-temurin:8-jre-alpine-3.23 +FROM eclipse-temurin:8-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT ENV REFRESHED_AT=$REFRESHED_AT -RUN echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/community >> /etc/apk/repositories \ - && echo @new-stable https://dl-cdn.alpinelinux.org/alpine/v3.21/main >> /etc/apk/repositories \ +RUN echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/community >> /etc/apk/repositories \ + && echo @old-stable https://dl-cdn.alpinelinux.org/alpine/v3.22/main >> /etc/apk/repositories \ && apk -U upgrade \ && apk add --no-cache \ - nodejs@new-stable \ - npm@new-stable \ + nodejs@old-stable \ + npm@old-stable \ yarn \ curl \ git diff --git a/8/jre/24/alpine/Dockerfile b/8/jre/24/alpine/Dockerfile index a0fd872..3918dc2 100644 --- a/8/jre/24/alpine/Dockerfile +++ b/8/jre/24/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:8-jre-alpine-3.23 +FROM eclipse-temurin:8-jre-alpine-3.24 LABEL maintainer="Tim Prüssing " ARG REFRESHED_AT diff --git a/8/jre/26/Dockerfile b/8/jre/26/Dockerfile new file mode 100644 index 0000000..908f00a --- /dev/null +++ b/8/jre/26/Dockerfile @@ -0,0 +1,26 @@ +FROM eclipse-temurin:8-jre +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT +ARG NODE_MAJOR=26 + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +RUN printf 'Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 1001' > /etc/apt/preferences.d/nodesource \ + && mkdir -p /etc/apt/keyrings \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + gpg \ + gpg-agent \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && 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 \ + && curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update -qq \ + && apt-get install -qq --no-install-recommends \ + nodejs \ + yarn \ + git \ + && apt-get upgrade -qq \ + && rm -rf /var/lib/apt/lists/* diff --git a/8/jre/26/alpine/Dockerfile b/8/jre/26/alpine/Dockerfile new file mode 100644 index 0000000..a165867 --- /dev/null +++ b/8/jre/26/alpine/Dockerfile @@ -0,0 +1,13 @@ +FROM eclipse-temurin:8-jre-alpine-3.24 +LABEL maintainer="Tim Prüssing " + +ARG REFRESHED_AT +ENV REFRESHED_AT=$REFRESHED_AT + +RUN apk -U upgrade \ + && apk add --no-cache \ + nodejs-current \ + npm \ + yarn \ + curl \ + git diff --git a/README.md b/README.md index 9ef1b6c..2c8d39c 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -# Java (JRE or JDK version 8, 11, 17, 21 or 25) with Node.js 22 LTS (Jod) or Node.js 24 LTS (Krypton) Dockerfile +# Java (JRE or JDK version 8, 11, 17, 21 or 25) with Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) Dockerfile [![Docker Automated build](https://img.shields.io/docker/automated/timbru31/java-node.svg)](https://hub.docker.com/r/timbru31/java-node/) [![buildx Status](https://github.com/timbru31/docker-java-node/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-java-node/actions?query=workflow%3Abuildx) [![Lint Dockerfiles](https://github.com/timbru31/docker-java-node/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-java-node/actions?query=workflow%3A%22Lint+Dockerfiles%22) -A minimal Dockerfile based on Eclipse Temurin's OpenJDK JRE or JDK 8/11/17/21/25 Dockerfile (regular, alpine) with Node.js 22 LTS (Jod) or Node.js 24 LTS (Krypton) installed. +A minimal Dockerfile based on Eclipse Temurin's OpenJDK JRE or JDK 8/11/17/21/25 Dockerfile (regular, alpine) with Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) installed. ## What's included - JRE or JDK 8/11/17/21/25 -- Node.js 22 LTS (Jod) or Node.js 24 LTS (Krypton) +- Node.js 22 LTS (Jod), Node.js 24 LTS (Krypton) or Node.js 26 (Lithium) - bundled npm that comes with the respective Node.js version (latest for Node.js on alpine, see [why](https://gitlab.alpinelinux.org/alpine/aports/-/commit/25b10bd1a93e12a7e49fee38b0a229281ae49fb7)) - yarn - curl