From 3194be4f556d81a83941b3a5fe23edf0e09c09e4 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 21 Aug 2023 20:30:21 +0200 Subject: [PATCH 1/2] Use nss_wrapper-libs only with smaller footprint --- 18/Dockerfile.c8s | 2 +- 18/Dockerfile.c9s | 2 +- 18/Dockerfile.rhel8 | 2 +- 18/Dockerfile.rhel9 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/18/Dockerfile.c8s b/18/Dockerfile.c8s index 7aa63855..de2cb60d 100644 --- a/18/Dockerfile.c8s +++ b/18/Dockerfile.c8s @@ -55,7 +55,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 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 && \ ln -s /usr/libexec/platform-python /usr/bin/python3 && \ yum install -y --setopt=tsflags=nodocs $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.rhel8 b/18/Dockerfile.rhel8 index cc850fa5..be1ee88a 100644 --- a/18/Dockerfile.rhel8 +++ b/18/Dockerfile.rhel8 @@ -55,7 +55,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 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 && \ ln -s /usr/libexec/platform-python /usr/bin/python3 && \ yum install -y --setopt=tsflags=nodocs $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 && \ From 0f2d4d79476fc1e1a18ee39d22f458a585df2ee4 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 14 Sep 2023 15:31:25 +0200 Subject: [PATCH 2/2] Add the latest container-common-scripts Signed-off-by: Petr "Stone" Hracek --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 7e222b8f..250ae7c6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7e222b8f9f5ac5c4dff6aa1248ddc20a18385a6e +Subproject commit 250ae7c6b9312e2389b08d349a1a95c59ed1dde9