Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replaces nss_wrapper with nss_wrapper-libs #713

Merged
merged 4 commits into from
Sep 24, 2024
Merged

replaces nss_wrapper with nss_wrapper-libs #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0362e46
This pull request replaces nss_wrapper with nss_wrapper-libs
phracek Sep 18, 2024
9e39b96
Add generated sources
phracek Sep 18, 2024
da66a09
Replace nss-wrapper with nss-wrapper-libs to have smaller footprint
phracek Sep 23, 2024
c568e90
Add generated files by distgen
phracek Sep 23, 2024
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
2 changes: 1 addition & 1 deletion 3.11-minimal/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.11-minimal/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.11/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.11/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-311" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.11/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-311" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.12-minimal/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.12-minimal/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.12-minimal/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.12-minimal/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.12/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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 && \
Expand Down
2 changes: 1 addition & 1 deletion 3.12/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.12/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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 && \
Expand Down
2 changes: 1 addition & 1 deletion 3.12/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-312" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.12/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-312" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.6/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ LABEL summary="$SUMMARY" \
maintainer="SoftwareCollections.org <[email protected]>"

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 && \
Expand Down
2 changes: 1 addition & 1 deletion 3.9-minimal/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.9-minimal/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down
2 changes: 1 addition & 1 deletion 3.9/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.9/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi8-python-39" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 3.9/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LABEL summary="$SUMMARY" \
io.buildpacks.stack.id="com.redhat.stacks.ubi9-python-39" \
maintainer="SoftwareCollections.org <[email protected]>"

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" && \
Expand Down
10 changes: 5 additions & 5 deletions specs/multispec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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']
Expand All @@ -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']
Expand All @@ -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']
Expand All @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile-minimal.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='*'

Expand Down