diff --git a/20-minimal/Dockerfile.c9s b/20-minimal/Dockerfile.c9s index f0eebe2d..f4e8a66c 100644 --- a/20-minimal/Dockerfile.c9s +++ b/20-minimal/Dockerfile.c9s @@ -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 diff --git a/22-minimal/Dockerfile.c10s b/22-minimal/Dockerfile.c10s index c63e79f1..d041d0d5 100644 --- a/22-minimal/Dockerfile.c10s +++ b/22-minimal/Dockerfile.c10s @@ -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 diff --git a/24-minimal/Dockerfile.c10s b/24-minimal/Dockerfile.c10s index e4b6ef3f..dfe25b3c 100644 --- a/24-minimal/Dockerfile.c10s +++ b/24-minimal/Dockerfile.c10s @@ -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 && \ diff --git a/24-minimal/Dockerfile.c9s b/24-minimal/Dockerfile.c9s index 9b7f6489..5f2968c7 100644 --- a/24-minimal/Dockerfile.c9s +++ b/24-minimal/Dockerfile.c9s @@ -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 diff --git a/common b/common index 18f00751..bf3bb466 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 18f00751b5e5cb1b23c040a20bcf3f65aa667c49 +Subproject commit bf3bb466071024741fdf7a19d64fd394aa994a31