From 413d435289dcced3040cf9724c62c9e4ddc9f172 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Wed, 16 Aug 2023 11:46:23 +0200 Subject: [PATCH] Use nss_wrapper-libs only to decrease size of the image This should let some depended perl packages go, so it is not only to get rid of files that were previously part of nss_wrapper and are not in nss_wrapper-libs. --- 16/Dockerfile.c9s | 2 +- 16/Dockerfile.fedora | 2 +- 16/Dockerfile.rhel9 | 2 +- 18/Dockerfile.c9s | 2 +- 18/Dockerfile.rhel9 | 2 +- 20/Dockerfile.c9s | 2 +- 20/Dockerfile.rhel9 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/16/Dockerfile.c9s b/16/Dockerfile.c9s index 8c80589e..c0a7dbdf 100644 --- a/16/Dockerfile.c9s +++ b/16/Dockerfile.c9s @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \ # Package libatomic_ops was removed RUN MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ diff --git a/16/Dockerfile.fedora b/16/Dockerfile.fedora index ed69388a..1eacdf30 100644 --- a/16/Dockerfile.fedora +++ b/16/Dockerfile.fedora @@ -50,7 +50,7 @@ LABEL summary="$SUMMARY" \ RUN yum -y module enable nodejs:$NODEJS_VERSION && \ MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs nodejs-nodemon npm nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs nodejs-nodemon npm nss_wrapper-libs which" && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \ diff --git a/16/Dockerfile.rhel9 b/16/Dockerfile.rhel9 index 5ca6686c..6934e2d3 100644 --- a/16/Dockerfile.rhel9 +++ b/16/Dockerfile.rhel9 @@ -54,7 +54,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build ubi9/$NAME-$NODEJS_VERSION:latest " RUN MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ diff --git a/18/Dockerfile.c9s b/18/Dockerfile.c9s index 99154154..bd0347e4 100644 --- a/18/Dockerfile.c9s +++ b/18/Dockerfile.c9s @@ -56,7 +56,7 @@ LABEL summary="$SUMMARY" \ # Package libatomic_ops was removed RUN yum -y module enable nodejs:$NODEJS_VERSION && \ MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ diff --git a/18/Dockerfile.rhel9 b/18/Dockerfile.rhel9 index 7a426154..d9730bd7 100644 --- a/18/Dockerfile.rhel9 +++ b/18/Dockerfile.rhel9 @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \ RUN yum -y module enable nodejs:$NODEJS_VERSION && \ MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ diff --git a/20/Dockerfile.c9s b/20/Dockerfile.c9s index 0c8e77c6..984223f4 100644 --- a/20/Dockerfile.c9s +++ b/20/Dockerfile.c9s @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # Package libatomic_ops was removed RUN yum -y module enable nodejs:$NODEJS_VERSION && \ MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ diff --git a/20/Dockerfile.rhel9 b/20/Dockerfile.rhel9 index a56a7a6d..6bf05d11 100644 --- a/20/Dockerfile.rhel9 +++ b/20/Dockerfile.rhel9 @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \ RUN yum -y module enable nodejs:$NODEJS_VERSION && \ MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \ - INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \ + INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper-libs which" && \ ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \