Skip to content

Enable nodejs24 for cXs and fix RHEL10 Dockerfiles #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hhorak merged 4 commits into from
Sep 22, 2025
Merged

Enable nodejs24 for cXs and fix RHEL10 Dockerfiles #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6210b1f
Remove exclude files for cXs and v24
hhorak Sep 5, 2025
3cccb1c
Add v24 into the README.md in the root and Makefile
hhorak Sep 5, 2025
fa51968
Do not remove binaries before creating symlinks
hhorak Sep 10, 2025
06bb08d
Create symlinks also in rhel10/c10s minimal to have node binary witho…
hhorak Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed 24-minimal/.exclude-c10s
View file
Open in desktop
Empty file.
Empty file removed 24-minimal/.exclude-c9s
View file
Open in desktop
Empty file.
5 changes: 4 additions & 1 deletion 24-minimal/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ LABEL summary="$SUMMARY" \
# nodejs-full-i18n is included for error strings
RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which" && \
dnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
node-24 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
dnf clean all && \
ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
Expand Down
5 changes: 4 additions & 1 deletion 24-minimal/Dockerfile.rhel10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ LABEL summary="$SUMMARY" \
# nodejs-full-i18n is included for error strings
RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which" && \
microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
microdnf clean all && \
ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
Expand Down
Empty file removed 24/.exclude-c10s
View file
Open in desktop
Empty file.
Empty file removed 24/.exclude-c9s
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions 24/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ LABEL summary="$SUMMARY" \
RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
rm /usr/bin/node && ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
rm /usr/bin/npm && ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
rm /usr/bin/npx && ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
dnf -y clean all --enablerepo='*'

Expand Down
6 changes: 3 additions & 3 deletions 24/Dockerfile.rhel10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ LABEL summary="$SUMMARY" \
RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
rm /usr/bin/node && ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
rm /usr/bin/npm && ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
rm /usr/bin/npx && ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
dnf -y clean all --enablerepo='*'

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Include common Makefile code.
BASE_IMAGE_NAME = nodejs
VERSIONS = 20 20-minimal 22 22-minimal
VERSIONS = 20 20-minimal 22 22-minimal 24 24-minimal
OPENSHIFT_NAMESPACES =

# HACK: Ensure that 'git pull' for old clones doesn't cause confusion.
Expand Down
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ NodeJS container images
Images available on Quay are:
* Fedora [nodejs-20](https://quay.io/repository/fedora/nodejs-20)
* Fedora [nodejs-22](https://quay.io/repository/fedora/nodejs-22)
* Fedora [nodejs-24](https://quay.io/repository/fedora/nodejs-24)

This repository contains the source for building various versions of
the Node.JS application as a reproducible container image using
Expand All @@ -29,6 +30,8 @@ Node.JS versions currently provided are:
* [NodeJS 20-minimal](20-minimal)
* [NodeJS 22](22)
* [NodeJS 22-minimal](22-minimal)
* [NodeJS 24](24)
* [NodeJS 24-minimal](24-minimal)

RHEL versions currently supported are:
* RHEL8
Expand Down Expand Up @@ -100,6 +103,12 @@ see [usage documentation](22/README.md).
For information about usage of Dockerfile for NodeJS 22 minimal,
see [usage documentation](22-minimal/README.md).

For information about usage of Dockerfile for NodeJS 24,
see [usage documentation](24/README.md).

For information about usage of Dockerfile for NodeJS 24 minimal,
see [usage documentation](24-minimal/README.md).

Test
----
This repository also provides a [S2I](https://github.com/openshift/source-to-image) test framework,
Expand Down