Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions 20-minimal/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ LABEL summary="$SUMMARY" \

# nodejs-full-i18n is included for error strings
RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which" && \
yum -y module disable nodejs && \
yum -y module enable nodejs:$NODEJS_VERSION && \
yum -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
microdnf -y module disable nodejs && \
microdnf -y module enable nodejs:$NODEJS_VERSION && \
microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
yum clean all && \
microdnf clean all && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
Expand Down
4 changes: 2 additions & 2 deletions 22-minimal/Dockerfile.c10s
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ LABEL summary="$SUMMARY" \

# nodejs-full-i18n is included for error strings
RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n npm findutils tar which" && \
dnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
node-22 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
dnf clean all && \
microdnf clean all && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
Expand Down
4 changes: 2 additions & 2 deletions 24-minimal/Dockerfile.c10s
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ 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 && \
dnf clean all && \
microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
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 && \
Expand Down
8 changes: 4 additions & 4 deletions 24-minimal/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ LABEL summary="$SUMMARY" \

# nodejs-full-i18n is included for error strings
RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which" && \
yum -y module disable nodejs && \
yum -y module enable nodejs:$NODEJS_VERSION && \
yum -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
microdnf -y module disable nodejs && \
microdnf -y module enable nodejs:$NODEJS_VERSION && \
microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
yum clean all && \
microdnf clean all && \
rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

COPY ./s2i/bin/ /usr/libexec/s2i
Expand Down
2 changes: 1 addition & 1 deletion common
Submodule common updated 1 files
+21 −2 common.mk