diff --git a/3.11-minimal/Dockerfile.c9s b/3.11-minimal/Dockerfile.c9s index 857b2679..311b25f7 100644 --- a/3.11-minimal/Dockerfile.c9s +++ b/3.11-minimal/Dockerfile.c9s @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.11 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.11 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.11-minimal/Dockerfile.rhel8 b/3.11-minimal/Dockerfile.rhel8 index 8d75da65..f259064b 100644 --- a/3.11-minimal/Dockerfile.rhel8 +++ b/3.11-minimal/Dockerfile.rhel8 @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.11 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.11 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.11/Dockerfile.c9s b/3.11/Dockerfile.c9s index 8df4f1d0..33138349 100644 --- a/3.11/Dockerfile.c9s +++ b/3.11/Dockerfile.c9s @@ -37,7 +37,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.11/test/setup-test-app/ $FGC/$NAME python-sample-app" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-pip nss_wrapper httpd \ +RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-pip nss_wrapper-libs httpd \ httpd-devel mod_ssl mod_auth_gssapi mod_ldap mod_session \ atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant \ krb5-devel" && \ diff --git a/3.11/Dockerfile.rhel8 b/3.11/Dockerfile.rhel8 index 906ee022..38c352b5 100644 --- a/3.11/Dockerfile.rhel8 +++ b/3.11/Dockerfile.rhel8 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-311" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-setuptools python3.11-pip nss_wrapper \ +RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-setuptools python3.11-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl \ enchant krb5-devel" && \ diff --git a/3.11/Dockerfile.rhel9 b/3.11/Dockerfile.rhel9 index c8531941..92a694ae 100644 --- a/3.11/Dockerfile.rhel9 +++ b/3.11/Dockerfile.rhel9 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-311" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-pip nss_wrapper httpd \ +RUN INSTALL_PKGS="python3.11 python3.11-devel python3.11-pip nss_wrapper-libs httpd \ httpd-devel mod_ssl mod_auth_gssapi mod_ldap mod_session \ atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant \ krb5-devel" && \ diff --git a/3.12-minimal/Dockerfile.c10s b/3.12-minimal/Dockerfile.c10s index 8025b109..e9722a4b 100644 --- a/3.12-minimal/Dockerfile.c10s +++ b/3.12-minimal/Dockerfile.c10s @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.12-minimal/Dockerfile.c9s b/3.12-minimal/Dockerfile.c9s index d7c68f45..0886fe32 100644 --- a/3.12-minimal/Dockerfile.c9s +++ b/3.12-minimal/Dockerfile.c9s @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.12-minimal/Dockerfile.fedora b/3.12-minimal/Dockerfile.fedora index d0feb352..4dbf9911 100644 --- a/3.12-minimal/Dockerfile.fedora +++ b/3.12-minimal/Dockerfile.fedora @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.12-minimal/Dockerfile.rhel8 b/3.12-minimal/Dockerfile.rhel8 index 7d900ee8..c6c8393b 100644 --- a/3.12-minimal/Dockerfile.rhel8 +++ b/3.12-minimal/Dockerfile.rhel8 @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python3.12 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.12/Dockerfile.c10s b/3.12/Dockerfile.c10s index 1e673065..d35a562e 100644 --- a/3.12/Dockerfile.c10s +++ b/3.12/Dockerfile.c10s @@ -37,7 +37,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.12/test/setup-test-app/ $FGC/$NAME python-sample-app" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper \ +RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session gcc-gfortran libffi-devel libtool-ltdl krb5-devel" && \ yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ diff --git a/3.12/Dockerfile.c9s b/3.12/Dockerfile.c9s index 6713d759..edefb3d7 100644 --- a/3.12/Dockerfile.c9s +++ b/3.12/Dockerfile.c9s @@ -37,7 +37,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.12/test/setup-test-app/ $FGC/$NAME python-sample-app" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-pip nss_wrapper httpd \ +RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-pip nss_wrapper-libs httpd \ httpd-devel mod_ssl mod_auth_gssapi mod_ldap mod_session \ atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant \ krb5-devel" && \ diff --git a/3.12/Dockerfile.fedora b/3.12/Dockerfile.fedora index e77a2461..42fe276f 100644 --- a/3.12/Dockerfile.fedora +++ b/3.12/Dockerfile.fedora @@ -37,7 +37,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.12/test/setup-test-app/ quay.io/fedora/$NAME-312 python-sample-app" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper \ +RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper-libs \ httpd httpd-devel atlas-devel gcc-gfortran libffi-devel \ libtool-ltdl enchant redhat-rpm-config krb5-devel" && \ dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ diff --git a/3.12/Dockerfile.rhel8 b/3.12/Dockerfile.rhel8 index 11757dfc..a67f5c69 100644 --- a/3.12/Dockerfile.rhel8 +++ b/3.12/Dockerfile.rhel8 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-312" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-setuptools python3.12-pip nss_wrapper \ +RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-setuptools python3.12-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl \ enchant krb5-devel" && \ diff --git a/3.12/Dockerfile.rhel9 b/3.12/Dockerfile.rhel9 index 19cffca9..eec25f1b 100644 --- a/3.12/Dockerfile.rhel9 +++ b/3.12/Dockerfile.rhel9 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-312" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-pip nss_wrapper httpd \ +RUN INSTALL_PKGS="python3.12 python3.12-devel python3.12-pip nss_wrapper-libs httpd \ httpd-devel mod_ssl mod_auth_gssapi mod_ldap mod_session \ atlas-devel gcc-gfortran libffi-devel libtool-ltdl enchant \ krb5-devel" && \ diff --git a/3.6/Dockerfile.rhel8 b/3.6/Dockerfile.rhel8 index 9c53bfa6..5868178e 100644 --- a/3.6/Dockerfile.rhel8 +++ b/3.6/Dockerfile.rhel8 @@ -39,7 +39,7 @@ LABEL summary="$SUMMARY" \ maintainer="SoftwareCollections.org " RUN INSTALL_PKGS="python36 python36-devel python3-virtualenv python3-setuptools python3-pip \ - nss_wrapper httpd httpd-devel mod_ssl mod_auth_gssapi \ + nss_wrapper-libs httpd httpd-devel mod_ssl mod_auth_gssapi \ mod_ldap mod_session atlas-devel gcc-gfortran libffi-devel \ libtool-ltdl enchant krb5-devel" && \ yum -y module enable python36:3.6 httpd:2.4 && \ diff --git a/3.9-minimal/Dockerfile.c9s b/3.9-minimal/Dockerfile.c9s index 99cafda0..dc7eb8ab 100644 --- a/3.9-minimal/Dockerfile.c9s +++ b/3.9-minimal/Dockerfile.c9s @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python39 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python39 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.9-minimal/Dockerfile.rhel8 b/3.9-minimal/Dockerfile.rhel8 index dd29699c..05f0a396 100644 --- a/3.9-minimal/Dockerfile.rhel8 +++ b/3.9-minimal/Dockerfile.rhel8 @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="python39 glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="python39 glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*' diff --git a/3.9/Dockerfile.c9s b/3.9/Dockerfile.c9s index d7124f2d..29a66f57 100644 --- a/3.9/Dockerfile.c9s +++ b/3.9/Dockerfile.c9s @@ -37,7 +37,7 @@ LABEL summary="$SUMMARY" \ usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.9/test/setup-test-app/ $FGC/$NAME python-sample-app" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper \ +RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl \ enchant krb5-devel" && \ diff --git a/3.9/Dockerfile.rhel8 b/3.9/Dockerfile.rhel8 index d491ac25..f4be1565 100644 --- a/3.9/Dockerfile.rhel8 +++ b/3.9/Dockerfile.rhel8 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-39" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python39 python39-devel python39-setuptools python39-pip nss_wrapper \ +RUN INSTALL_PKGS="python39 python39-devel python39-setuptools python39-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl \ enchant krb5-devel" && \ diff --git a/3.9/Dockerfile.rhel9 b/3.9/Dockerfile.rhel9 index 2d106f0d..9dcde2a1 100644 --- a/3.9/Dockerfile.rhel9 +++ b/3.9/Dockerfile.rhel9 @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \ io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-39" \ maintainer="SoftwareCollections.org " -RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper \ +RUN INSTALL_PKGS="python3 python3-devel python3-setuptools python3-pip nss_wrapper-libs \ httpd httpd-devel mod_ssl mod_auth_gssapi mod_ldap \ mod_session atlas-devel gcc-gfortran libffi-devel libtool-ltdl \ enchant krb5-devel" && \ diff --git a/specs/multispec.yml b/specs/multispec.yml index 91958418..c4c9a518 100644 --- a/specs/multispec.yml +++ b/specs/multispec.yml @@ -14,7 +14,7 @@ specs: logos: "redhat-logos-httpd" preinstall_cmd: ['yum -y module enable {{ spec.module_stream }} httpd:2.4'] python_pkgs: [] - base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'mod_ssl', + base_pkgs: ['nss_wrapper-libs', 'httpd', 'httpd-devel', 'mod_ssl', 'mod_auth_gssapi', 'mod_ldap', 'mod_session', 'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'enchant', 'krb5-devel'] @@ -39,7 +39,7 @@ specs: prod: "rhel9" logos: "redhat-logos-httpd" python_pkgs: [] - base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'mod_ssl', + base_pkgs: ['nss_wrapper-libs', 'httpd', 'httpd-devel', 'mod_ssl', 'mod_auth_gssapi', 'mod_ldap', 'mod_session', 'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'enchant', 'krb5-devel'] @@ -59,7 +59,7 @@ specs: org: "sclorg" prod: "c9s" python_pkgs: [] - base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'mod_ssl', + base_pkgs: ['nss_wrapper-libs', 'httpd', 'httpd-devel', 'mod_ssl', 'mod_auth_gssapi', 'mod_ldap', 'mod_session', 'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'enchant', 'krb5-devel'] @@ -78,7 +78,7 @@ specs: org: "sclorg" prod: "c10s" python_pkgs: [] - base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'mod_ssl', + base_pkgs: ['nss_wrapper-libs', 'httpd', 'httpd-devel', 'mod_ssl', 'mod_auth_gssapi', 'mod_ldap', 'mod_session', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'krb5-devel'] @@ -94,7 +94,7 @@ specs: img_tag: "40" org: "fedora" python_pkgs: ['python3', 'python3-devel', 'python3-setuptools', 'python3-pip'] - base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'atlas-devel', 'gcc-gfortran', + base_pkgs: ['nss_wrapper-libs', 'httpd', 'httpd-devel', 'atlas-devel', 'gcc-gfortran', 'libffi-devel', 'libtool-ltdl', 'enchant', 'redhat-rpm-config', 'krb5-devel'] diff --git a/src/Dockerfile-minimal.template b/src/Dockerfile-minimal.template index 4d8a9aec..5ef4f3f3 100644 --- a/src/Dockerfile-minimal.template +++ b/src/Dockerfile-minimal.template @@ -61,7 +61,7 @@ LABEL summary="$SUMMARY" \ # glibc-langpack-en is needed to set locale to en_US and disable warning about it # findutils - find command is needed for fix-permissions script # nss_wrapper - used in generate_container_user script -RUN INSTALL_PKGS="{{ spec.pkg_prefix }} glibc-langpack-en findutils nss_wrapper" && \ +RUN INSTALL_PKGS="{{ spec.pkg_prefix }} glibc-langpack-en findutils nss_wrapper-libs" && \ microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \ microdnf -y clean all --enablerepo='*'